소스 검색

CI: lint scripts

liushuyu 4 년 전
부모
커밋
312e5eda66
2개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      .ci/scripts/common/post-upload.sh
  2. 1 2
      .ci/scripts/windows/docker.sh

+ 1 - 1
.ci/scripts/common/post-upload.sh

@@ -4,7 +4,7 @@
 cp license.txt "$DIR_NAME"
 cp README.md "$DIR_NAME"
 
-if [[ "x${NO_SOURCE_PACK}" == "x" ]]; then
+if [[ -z "${NO_SOURCE_PACK}" ]]; then
   tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt
   cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME"
 fi

+ 1 - 2
.ci/scripts/windows/docker.sh

@@ -14,8 +14,7 @@ mkdir -p build && cd build
 export LDFLAGS="-fuse-ld=lld"
 # -femulated-tls required due to an incompatibility between GCC and Clang
 # TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate
-export CFLAGS="-femulated-tls"
-export CXXFLAGS="${CFLAGS}"
+export CXXFLAGS="-femulated-tls"
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \