summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2022-07-24 16:33:55 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2022-07-27 12:52:55 +0000
commitf169b258e95e329d81c42ddfd65b084fd97e47ef (patch)
tree933dee52a41f5627881b7ce28a30cefb7bc9b765
parentd6019de28724f7b7283e825cda0507fa0a0c3431 (diff)
downloadqbs-f169b258e95e329d81c42ddfd65b084fd97e47ef.tar.gz
GitHub actions: Update macOS jobs
Also, remove XCode 10.3 because macos-10.15 runner is deprecated. Change-Id: I32285f2cd6ba70ac17d7080a7b9b5bc248487f58 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--.github/workflows/main.yml40
1 files changed, 20 insertions, 20 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bacf90555..64133d05e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -122,7 +122,7 @@ jobs:
build-macos:
name: Build on macOS
- runs-on: macos-10.15
+ runs-on: macos-11
timeout-minutes: 60
env:
BUILD_OPTIONS: |
@@ -613,56 +613,56 @@ jobs:
matrix:
config:
- {
- name: 'Run macOS tests (Xcode 12.5)',
- runner: 'macos-11.0',
+ name: 'Run macOS tests (Xcode 13.4)',
+ runner: 'macos-12',
target: 'desktop',
toolchain: 'clang_64',
- testProfile: 'xcode_12_5_1-macosx-x86_64',
+ testProfile: 'xcode_13_4-macosx-x86_64',
qtVersion: '5.15.2',
script: './scripts/test-qbs.sh',
}
- {
- name: 'Run macOS tests (Xcode 12.5, Qt 6.0)',
- runner: 'macos-11.0',
+ name: 'Run macOS tests (Xcode 13.4, Qt 6.3)',
+ runner: 'macos-12',
target: 'desktop',
toolchain: 'clang_64',
- testProfile: 'xcode_12_5_1-macosx-x86_64',
- qtVersion: '6.0.2',
+ testProfile: 'xcode_13_4-macosx-x86_64',
+ qtVersion: '6.3.1',
script: './scripts/test-qt.sh',
}
- {
- name: 'Run iOS tests (Xcode 12.5)',
- runner: 'macos-11.0',
+ name: 'Run iOS tests (Xcode 13.4)',
+ runner: 'macos-12',
target: 'ios',
toolchain: 'ios',
- testProfile: 'xcode_12_5_1-iphoneos-arm64',
+ testProfile: 'xcode_13_4-iphoneos-arm64',
qtVersion: '5.15.2',
script: './scripts/test-qbs.sh',
}
- {
- name: 'Run iOS-sim tests (Xcode 12.5)',
- runner: 'macos-11.0',
+ name: 'Run iOS-sim tests (Xcode 13.4)',
+ runner: 'macos-12',
target: 'ios',
toolchain: 'ios',
- testProfile: 'xcode_12_5_1-iphonesimulator-x86_64',
+ testProfile: 'xcode_13_4-iphonesimulator-x86_64',
qtVersion: '5.15.2',
script: './scripts/test-qbs.sh',
}
- {
- name: 'Run macOS tests (Xcode 11.6)',
- runner: 'macos-10.15',
+ name: 'Run macOS tests (Xcode 12.5)',
+ runner: 'macos-11.0',
target: 'desktop',
toolchain: 'clang_64',
- testProfile: 'xcode_11_6-macosx-x86_64',
+ testProfile: 'xcode_12_5_1-macosx-x86_64',
qtVersion: '5.15.2',
script: './scripts/test-qbs.sh',
}
- {
- name: 'Run macOS tests (Xcode 10.3)',
- runner: 'macos-10.15',
+ name: 'Run macOS tests (Xcode 11.7)',
+ runner: 'macos-11.0',
target: 'desktop',
toolchain: 'clang_64',
- testProfile: 'xcode_10_3-macosx-x86_64',
+ testProfile: 'xcode_11_7-macosx-x86_64',
qtVersion: '5.15.2',
script: './scripts/test-qbs.sh',
}