diff options
author | James Rowe <jroweboy@gmail.com> | 2020-05-08 15:09:29 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-08 17:09:29 -0400 |
commit | bc30a591ba7252e0c16d9c1b3c75a7073735bcae (patch) | |
tree | 2e88ab16d60c7df3e665bcf7c75c24683cb07189 /.ci/scripts/format | |
parent | 50c27d5ae1bfe6cff6f091f07d68ab7b8e394d9d (diff) |
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/format')
-rw-r--r-- | .ci/scripts/format/exec.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.ci/scripts/format/exec.sh b/.ci/scripts/format/exec.sh index 5d6393b38..e9e9d2e17 100644 --- a/.ci/scripts/format/exec.sh +++ b/.ci/scripts/format/exec.sh @@ -1,4 +1,7 @@ #!/bin/bash -ex chmod a+x ./.ci/scripts/format/docker.sh +# the UID for the container yuzu user is 1027 +sudo chown -R 1027 ./ docker run -v $(pwd):/yuzu yuzuemu/build-environments:linux-clang-format /bin/bash -ex /yuzu/.ci/scripts/format/docker.sh +sudo chown -R $UID ./ |