diff options
| author |  liushuyu | 2022-07-04 21:18:17 -0600 |
|---|---|---|
| committer | liushuyu | 2022-07-04 21:21:56 -0600 |
| commit | 312e5eda66e4e610300bfa178f1c1ce70293bc12 (patch) | |
| tree | de8f437907743324a95f3a52712d2e48404f35bb /.ci | |
| parent | CI: workaround appimage generation if FUSE is not available (diff) | |
| download | yuzu-312e5eda66e4e610300bfa178f1c1ce70293bc12.tar.gz yuzu-312e5eda66e4e610300bfa178f1c1ce70293bc12.tar.xz yuzu-312e5eda66e4e610300bfa178f1c1ce70293bc12.zip | |
CI: lint scripts
Diffstat (limited to '.ci')
| -rw-r--r-- | .ci/scripts/common/post-upload.sh | 2 | ||||
| -rwxr-xr-x | .ci/scripts/windows/docker.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.ci/scripts/common/post-upload.sh b/.ci/scripts/common/post-upload.sh index 91ef750fe..a4e3070fd 100644 --- a/.ci/scripts/common/post-upload.sh +++ b/.ci/scripts/common/post-upload.sh | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | cp license.txt "$DIR_NAME" | 4 | cp license.txt "$DIR_NAME" |
| 5 | cp README.md "$DIR_NAME" | 5 | cp README.md "$DIR_NAME" |
| 6 | 6 | ||
| 7 | if [[ "x${NO_SOURCE_PACK}" == "x" ]]; then | 7 | if [[ -z "${NO_SOURCE_PACK}" ]]; then |
| 8 | tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt | 8 | tar -cJvf "${REV_NAME}-source.tar.xz" src externals CMakeLists.txt README.md license.txt |
| 9 | cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME" | 9 | cp -v "${REV_NAME}-source.tar.xz" "$DIR_NAME" |
| 10 | fi | 10 | fi |
diff --git a/.ci/scripts/windows/docker.sh b/.ci/scripts/windows/docker.sh index d0c70bf09..dcdf39e3e 100755 --- a/.ci/scripts/windows/docker.sh +++ b/.ci/scripts/windows/docker.sh | |||
| @@ -14,8 +14,7 @@ mkdir -p build && cd build | |||
| 14 | export LDFLAGS="-fuse-ld=lld" | 14 | export LDFLAGS="-fuse-ld=lld" |
| 15 | # -femulated-tls required due to an incompatibility between GCC and Clang | 15 | # -femulated-tls required due to an incompatibility between GCC and Clang |
| 16 | # TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate | 16 | # TODO(lat9nq): If this is widespread, we probably need to add this to CMakeLists where appropriate |
| 17 | export CFLAGS="-femulated-tls" | 17 | export CXXFLAGS="-femulated-tls" |
| 18 | export CXXFLAGS="${CFLAGS}" | ||
| 19 | cmake .. \ | 18 | cmake .. \ |
| 20 | -DCMAKE_BUILD_TYPE=Release \ | 19 | -DCMAKE_BUILD_TYPE=Release \ |
| 21 | -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ | 20 | -DCMAKE_TOOLCHAIN_FILE="${PWD}/../CMakeModules/MinGWClangCross.cmake" \ |