diff options
| author |  James Rowe | 2020-05-08 15:09:29 -0600 |
|---|---|---|
| committer |  GitHub | 2020-05-08 17:09:29 -0400 |
| commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
| tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /.ci/scripts/linux/exec.sh | |
| parent | Merge pull request #3885 from ReinUsesLisp/viewport-swizzles (diff) | |
| download | yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.gz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.tar.xz yuzu-bc30a591ba7252e0c16d9c1b3c75a7073735bcae.zip | |
Replace externals with Conan (#3735)
* Remove git submodules that will be loaded through conan
* Move custom Find modules to their own folder
* Use conan for downloading missing external dependencies
* CI: Change the yuzu source folder user to the user that the containers run on
* Attempt to remove dirty mingw build hack
* Install conan on the msvc build
* Only set release build type when using not using multi config generator
* Re-add qt bundled to workaround an issue with conan qt not downloading prebuilt binaries
* Add workaround for submodules that use legacy CMAKE variables
* Re-add USE_BUNDLED_QT on the msvc build bot
Diffstat (limited to '.ci/scripts/linux/exec.sh')
| -rw-r--r-- | .ci/scripts/linux/exec.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.ci/scripts/linux/exec.sh b/.ci/scripts/linux/exec.sh index 9fafa9208..a7deddeb3 100644 --- a/.ci/scripts/linux/exec.sh +++ b/.ci/scripts/linux/exec.sh | |||
| @@ -2,4 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | mkdir -p "ccache" || true | 3 | mkdir -p "ccache" || true |
| 4 | chmod a+x ./.ci/scripts/linux/docker.sh | 4 | chmod a+x ./.ci/scripts/linux/docker.sh |
| 5 | # the UID for the container yuzu user is 1027 | ||
| 6 | sudo chown -R 1027 ./ | ||
| 5 | docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1 | 7 | docker run -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v $(pwd):/yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh $1 |
| 8 | sudo chown -R $UID ./ | ||