diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2023-05-01 01:37:33 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-05-03 09:29:54 +0000 |
| commit | 03e717b06ed5c0864618e763f08f91d9fc94b733 (patch) | |
| tree | 3e73ec31e04d2226fb692263320bd38ae3862167 | |
| parent | 4b272a729e45a7330124604b7025ab0a49b58bbf (diff) | |
| download | qbs-03e717b06ed5c0864618e763f08f91d9fc94b733.tar.gz | |
GitHub actions: bump Qt versions on mac to 6.5.0
... and on iOS to 6.3.2 since newer versions are not
supported yet.
Change-Id: I7f021bedc59d7ae25793830db1e27f5f4a6f0a24
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/workflows/main.yml | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6740ddf51..d66a5b461 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -629,17 +629,17 @@ jobs: toolchain: 'clang_64', xcodeVersion: '14.2', testProfile: 'xcode_14_2-macosx-x86_64', - qtVersion: '5.15.2', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { - name: 'Run macOS tests (Xcode 14.2, Qt 6.3)', + name: 'Run macOS tests (Xcode 14.2, Qt 5.15)', runner: 'macos-12', target: 'desktop', toolchain: 'clang_64', xcodeVersion: '14.2', testProfile: 'xcode_14_2-macosx-x86_64', - qtVersion: '6.3.1', + qtVersion: '5.15.2', script: './scripts/test-qt.sh', } - { @@ -649,7 +649,7 @@ jobs: toolchain: 'ios', xcodeVersion: '14.2', testProfile: 'xcode_14_1-iphoneos-arm64', - qtVersion: '5.15.2', + qtVersion: '6.3.2', script: './scripts/test-qbs.sh', } - { @@ -659,7 +659,7 @@ jobs: toolchain: 'ios', xcodeVersion: '14.2', testProfile: 'xcode_14_1-iphonesimulator-x86_64', - qtVersion: '5.15.2', + qtVersion: '6.3.2', script: './scripts/test-qbs.sh', } - { @@ -669,7 +669,7 @@ jobs: toolchain: 'clang_64', xcodeVersion: '13.4.1', testProfile: 'xcode_13_4_1-macosx-x86_64', - qtVersion: '5.15.2', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } @@ -680,7 +680,7 @@ jobs: toolchain: 'clang_64', xcodeVersion: '12.5.1', testProfile: 'xcode_12_5_1-macosx-x86_64', - qtVersion: '5.15.2', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } steps: @@ -696,6 +696,13 @@ jobs: run: echo "./release/install-root/usr/local/bin" >> $GITHUB_PATH - name: Install required packages run: brew install capnp ccache grpc icoutils makensis protobuf p7zip + - name: Install Host Qt + if: matrix.config.toolchain == 'ios' + uses: ./.github/actions/download-qt + with: + target: 'desktop' + toolchain: 'clang_64' + version: ${{ matrix.config.qtVersion }} - name: Install Qt uses: ./.github/actions/download-qt with: |