diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2023-06-09 10:32:44 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2023-06-09 10:32:44 +0200 |
| commit | f8335f02f263d69d81d2557c0c4f87b7148cbe9d (patch) | |
| tree | 6832af025abb02ab7961539eb82442587a66fdb0 /.github | |
| parent | 8d3df7e35c48f5e0696e0efc527e43acbaedc92c (diff) | |
| parent | 134d6b6666c1d121b6134a02c4766576705700aa (diff) | |
Merge 2.0 into 2.1
Change-Id: I3a2da652e00ff2adb5e899ce99ad7ed1b8ca37b2
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/main.yml | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3006be6c7..81266d725 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -617,63 +617,72 @@ jobs: matrix: config: - { - name: 'Run macOS tests (Xcode 14.2)', - runner: 'macos-12', + name: 'Run macOS tests (Xcode 14.3)', + runner: 'macos-13', target: 'desktop', toolchain: 'clang_64', - xcodeVersion: '14.2', + xcodeVersion: '14.3', + testProfile: 'xcode_14_3-macosx-x86_64', + qtVersion: '5.15.2', + script: './scripts/test-qbs.sh', + } + - { + name: 'Run macOS tests (Xcode 14.3)', + runner: 'macos-13', + target: 'desktop', + toolchain: 'clang_64', + xcodeVersion: '14.3', testProfile: 'xcode_14_2-macosx-x86_64', qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { - name: 'Run macOS tests (Xcode 14.2, Qt 5.15)', - runner: 'macos-12', + name: 'Run macOS tests (Xcode 14.3, Qt 5.15)', + runner: 'macos-13', target: 'desktop', toolchain: 'clang_64', - xcodeVersion: '14.2', + xcodeVersion: '14.3', testProfile: 'xcode_14_2-macosx-x86_64', qtVersion: '5.15.2', script: './scripts/test-qt.sh', } - { - name: 'Run iOS tests (Xcode 14.2)', - runner: 'macos-12', + name: 'Run iOS tests (Xcode 14.3)', + runner: 'macos-13', target: 'ios', toolchain: 'ios', - xcodeVersion: '14.2', + xcodeVersion: '14.3', testProfile: 'xcode_14_1-iphoneos-arm64', qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { - name: 'Run iOS-sim tests (Xcode 14.2)', - runner: 'macos-12', + name: 'Run iOS-sim tests (Xcode 14.3)', + runner: 'macos-13', target: 'ios', toolchain: 'ios', - xcodeVersion: '14.2', + xcodeVersion: '14.3', testProfile: 'xcode_14_1-iphonesimulator-x86_64', qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - { - name: 'Run macOS tests (Xcode 13.4)', - runner: 'macos-12', + name: 'Run macOS tests (Xcode 14.2)', + runner: 'macos-13', target: 'desktop', toolchain: 'clang_64', - xcodeVersion: '13.4.1', - testProfile: 'xcode_13_4_1-macosx-x86_64', + xcodeVersion: '14.2', + testProfile: 'xcode_14_2-macosx-x86_64', qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } - - { - name: 'Run macOS tests (Xcode 12.5)', - runner: 'macos-11', + name: 'Run macOS tests (Xcode 13.4)', + runner: 'macos-12', target: 'desktop', toolchain: 'clang_64', - xcodeVersion: '12.5.1', - testProfile: 'xcode_12_5_1-macosx-x86_64', + xcodeVersion: '13.4.1', + testProfile: 'xcode_13_4_1-macosx-x86_64', qtVersion: '6.5.0', script: './scripts/test-qbs.sh', } |