diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-03 12:21:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-05-03 12:21:53 +0200 |
| commit | cdc4d8a0c694598fd4aa6ab484f562d99a094870 (patch) | |
| tree | d1703a9fcc195366ebba1a469cce43fb4d400897 /.github/workflows/main.yml | |
| parent | 1f5f46e572cf7ffcd2ae4e90024349928719ba35 (diff) | |
| parent | 03e717b06ed5c0864618e763f08f91d9fc94b733 (diff) | |
Merge 2.0 into master
Change-Id: I521dd5baab4b4374f9221a163ba8e83531edf8bb
Diffstat (limited to '.github/workflows/main.yml')
| -rw-r--r-- | .github/workflows/main.yml | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 80c5c0228..dacf54a9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -629,43 +629,43 @@ jobs: matrix: config: - { - name: 'Run macOS tests (Xcode 14.1)', + name: 'Run macOS tests (Xcode 14.2)', runner: 'macos-12', target: 'desktop', toolchain: 'clang_64', - xcodeVersion: '14.1', - testProfile: 'xcode_14_1-macosx-x86_64', - qtVersion: '5.15.2', + xcodeVersion: '14.2', + testProfile: 'xcode_14_2-macosx-x86_64', + qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { - name: 'Run macOS tests (Xcode 14.1, Qt 6.3)', + name: 'Run macOS tests (Xcode 14.2, Qt 5.15)', runner: 'macos-12', target: 'desktop', toolchain: 'clang_64', - xcodeVersion: '14.1', - testProfile: 'xcode_14_1-macosx-x86_64', - qtVersion: '6.3.1', + xcodeVersion: '14.2', + testProfile: 'xcode_14_2-macosx-x86_64', + qtVersion: '5.15.2', script: './scripts/test-qt.sh', } - { - name: 'Run iOS tests (Xcode 14.1)', + name: 'Run iOS tests (Xcode 14.2)', runner: 'macos-12', target: 'ios', toolchain: 'ios', - xcodeVersion: '14.1', + xcodeVersion: '14.2', testProfile: 'xcode_14_1-iphoneos-arm64', - qtVersion: '5.15.2', + qtVersion: '6.3.2', script: './scripts/test-qbs.sh', } - { - name: 'Run iOS-sim tests (Xcode 14.1)', + name: 'Run iOS-sim tests (Xcode 14.2)', runner: 'macos-12', target: 'ios', toolchain: 'ios', - xcodeVersion: '14.1', + xcodeVersion: '14.2', testProfile: 'xcode_14_1-iphonesimulator-x86_64', - qtVersion: '5.15.2', + qtVersion: '6.3.2', script: './scripts/test-qbs.sh', } - { @@ -675,7 +675,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', } @@ -686,7 +686,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: @@ -702,6 +702,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: |