diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2022-10-27 01:39:46 +0300 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-10-27 10:08:07 +0000 |
commit | 7660657185fee3d40d84813c5de99d1ff8a219ba (patch) | |
tree | 6aeb6557573bd51a3fa9ab62c15474305d6dbe90 | |
parent | eed7b6e66b35a0309b1572708b333c172cf80279 (diff) | |
download | qbs-7660657185fee3d40d84813c5de99d1ff8a219ba.tar.gz |
GitHub actions: select default xcode before running tests
Some tests, such as TestBlackbox::minimumSystemVersion or
TestBlackbox::emptyProfile use the default Xcode version
instead of the one specified by the profile.
This leads to fails of those tests with very old/new
xcode versions.
Fix that by making sure that the default Xcode is the
same as the one specified via profile.
Change-Id: I6d741ece7924d836c1fc66b496fe135bb47de72e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | .github/workflows/main.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 811add8cc..994e89e4e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -617,6 +617,7 @@ jobs: runner: 'macos-12', target: 'desktop', toolchain: 'clang_64', + xcodeVersion: '13.4.1', testProfile: 'xcode_13_4_1-macosx-x86_64', qtVersion: '5.15.2', script: './scripts/test-qbs.sh', @@ -626,6 +627,7 @@ jobs: runner: 'macos-12', target: 'desktop', toolchain: 'clang_64', + xcodeVersion: '13.4.1', testProfile: 'xcode_13_4_1-macosx-x86_64', qtVersion: '6.3.1', script: './scripts/test-qt.sh', @@ -635,6 +637,7 @@ jobs: runner: 'macos-12', target: 'ios', toolchain: 'ios', + xcodeVersion: '13.4.1', testProfile: 'xcode_13_4_1-iphoneos-arm64', qtVersion: '5.15.2', script: './scripts/test-qbs.sh', @@ -644,6 +647,7 @@ jobs: runner: 'macos-12', target: 'ios', toolchain: 'ios', + xcodeVersion: '13.4.1', testProfile: 'xcode_13_4_1-iphonesimulator-x86_64', qtVersion: '5.15.2', script: './scripts/test-qbs.sh', @@ -653,6 +657,7 @@ jobs: runner: 'macos-11', target: 'desktop', toolchain: 'clang_64', + xcodeVersion: '12.5.1', testProfile: 'xcode_12_5_1-macosx-x86_64', qtVersion: '5.15.2', script: './scripts/test-qbs.sh', @@ -662,6 +667,7 @@ jobs: runner: 'macos-11', target: 'desktop', toolchain: 'clang_64', + xcodeVersion: '11.7', testProfile: 'xcode_11_7-macosx-x86_64', qtVersion: '5.15.2', script: './scripts/test-qbs.sh', @@ -687,6 +693,8 @@ jobs: target: ${{ matrix.config.target }} toolchain: ${{ matrix.config.toolchain }} version: ${{ matrix.config.qtVersion }} + - name: Select Xcode + run: sudo xcode-select --switch /Applications/Xcode_${{ matrix.config.xcodeVersion }}.app - name: Setup Qbs run: | qbs setup-toolchains --detect |