Skip to content

Commit 25da83c

Browse files
jonsimantovsunmou99
jonsimantov
and
sunmou99
authored
Change macos runners to macos-12. (requires updating xcode to 13.1) (#917)
* Change xcode version to 13.3.1 and macos runners to macos-12. * Temporarily build with Xcode 13.1. * Update simulators for macos-12 runners * Rename iOS job to be consistent with runner name. Co-authored-by: Mou <[email protected]>
1 parent 65e16b5 commit 25da83c

File tree

7 files changed

+67
-66
lines changed

7 files changed

+67
-66
lines changed

‎.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
env:
1414
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
1515
GITHUB_TOKEN: ${{ github.token }}
16-
xcodeVersion: "12.4" # Only affects Mac runners, and only for prerequisites.
16+
xcodeVersion: "13.1" # Only affects Mac runners, and only for prerequisites.
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}

‎.github/workflows/cpp-packaging.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ env:
3232
demumbleVer: "1.1.0"
3333
# Use SHA256 for hashing files.
3434
hashCommand: "sha256sum"
35-
# Xcode version 12.4 is the version we build the SDK with.
35+
# Xcode version 13.1 is the version we build the SDK with.
3636
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
37-
xcodeVersion: "12.4"
37+
xcodeVersion: "13.1"
3838
# LLVM version with ARM MachO support has no version number yet.
3939
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
4040
GITHUB_TOKEN: ${{ github.token }}
@@ -79,13 +79,13 @@ jobs:
7979
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
8080
strategy:
8181
matrix:
82-
os: [ubuntu-latest, macos-latest]
82+
os: [ubuntu-latest, macos-12]
8383
include:
8484
- os: ubuntu-latest
8585
tools_platform: linux
8686
# Binutils 2.35.1 released Sep 19, 2020
8787
binutils_version: "2.35.1"
88-
- os: macos-latest
88+
- os: macos-12
8989
tools_platform: darwin
9090
# Binutils 2.35.1 released Sep 19, 2020
9191
binutils_version: "2.35.1"
@@ -180,7 +180,7 @@ jobs:
180180

181181
build_and_package_ios_tvos:
182182
name: build-and-package-ios-tvos
183-
runs-on: macos-latest
183+
runs-on: macos-12
184184
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
185185
steps:
186186
- name: Store git credentials for all git commands
@@ -300,7 +300,7 @@ jobs:
300300
strategy:
301301
fail-fast: false
302302
matrix:
303-
os: [windows-latest, ubuntu-latest, macos-latest]
303+
os: [windows-latest, ubuntu-latest, macos-12]
304304
build_type: ["Release", "Debug"]
305305
architecture: ["x64", "x86", "arm64"]
306306
msvc_runtime: ["static", "dynamic"]
@@ -320,21 +320,21 @@ jobs:
320320
vcpkg_triplet_suffix: "linux"
321321
additional_build_flags: ""
322322
sdk_platform: "linux"
323-
- os: macos-latest
323+
- os: macos-12
324324
vcpkg_triplet_suffix: "osx"
325325
additional_build_flags: "--target_format libraries"
326326
sdk_platform: "darwin"
327327

328328
exclude:
329329
- os: windows-latest
330330
linux_abi: "c++11"
331-
- os: macos-latest
331+
- os: macos-12
332332
architecture: "x86"
333-
- os: macos-latest
333+
- os: macos-12
334334
msvc_runtime: "dynamic"
335-
- os: macos-latest
335+
- os: macos-12
336336
linux_abi: "c++11"
337-
- os: macos-latest
337+
- os: macos-12
338338
build_type: "Debug"
339339
- os: ubuntu-latest
340340
msvc_runtime: "dynamic"
@@ -495,7 +495,7 @@ jobs:
495495
suffix: '-x64-Debug-dynamic'
496496
runs_on_platform: ubuntu-latest
497497
- sdk_platform: darwin
498-
runs_on_platform: macos-latest
498+
runs_on_platform: macos-12
499499
exclude:
500500
- sdk_platform: windows
501501
suffix: ''

‎.github/workflows/desktop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ jobs:
7171
# msvc_runtime excludes
7272
- os: ubuntu-latest
7373
msvc_runtime: "dynamic"
74-
- os: macos-latest
74+
- os: macos-12
7575
msvc_runtime: "dynamic"
7676
# architecture excluees
77-
- os: macos-latest
77+
- os: macos-12
7878
architecture: "x86"
7979
# Xcode excludes -- allow only one on osx and linux
8080
- os: ubuntu-latest

‎.github/workflows/integration_tests.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
required: true
2121
operating_systems:
2222
description: 'CSV of VMs to run on'
23-
default: 'ubuntu-latest,windows-latest,macos-latest'
23+
default: 'ubuntu-latest,windows-latest,macos-12'
2424
required: true
2525
desktop_ssl_variants:
2626
description: 'CSV of desktop SSL variants to use'
@@ -534,7 +534,7 @@ jobs:
534534
build_ios:
535535
name: build-ios-macos-latest
536536
needs: [check_and_prepare]
537-
runs-on: macos-latest
537+
runs-on: macos-12
538538
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() && !failure()
539539
strategy:
540540
fail-fast: false
@@ -599,30 +599,30 @@ jobs:
599599
--t ${{ needs.check_and_prepare.outputs.apis }} \
600600
--output_directory "${{ github.workspace }}" \
601601
--ios_sdk ${{ needs.check_and_prepare.outputs.mobile_test_on }} \
602-
--artifact_name "ios-macos-latest" \
602+
--artifact_name "ios-macos-12" \
603603
--noadd_timestamp \
604604
--short_output_paths \
605605
${additional_flags[*]}
606606
- name: Prepare results summary artifact
607607
if: ${{ !cancelled() }}
608608
shell: bash
609609
run: |
610-
if [ ! -f build-results-ios-macos-latest.log.json ]; then
611-
echo "__SUMMARY_MISSING__" > build-results-ios-macos-latest.log.json
610+
if [ ! -f build-results-ios-macos-12.log.json ]; then
611+
echo "__SUMMARY_MISSING__" > build-results-ios-macos-12.log.json
612612
fi
613613
- name: Upload iOS integration tests artifact
614614
uses: actions/upload-artifact@v3
615615
if: ${{ !cancelled() }}
616616
with:
617-
name: testapps-ios-macos-latest
618-
path: testapps-ios-macos-latest
617+
name: testapps-ios-macos-12
618+
path: testapps-ios-macos-12
619619
retention-days: ${{ env.artifactRetentionDays }}
620620
- name: Upload iOS build results artifact
621621
uses: actions/upload-artifact@v3
622622
if: ${{ !cancelled() }}
623623
with:
624624
name: log-artifact
625-
path: build-results-ios-macos-latest*
625+
path: build-results-ios-macos-12*
626626
retention-days: ${{ env.artifactRetentionDays }}
627627
- name: Download log artifacts
628628
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
@@ -643,15 +643,15 @@ jobs:
643643
if: ${{ !cancelled() }}
644644
shell: bash
645645
run: |
646-
cat build-results-ios-macos-latest.log
646+
cat build-results-ios-macos-12.log
647647
if [[ "${{ job.status }}" != "success" ]]; then
648648
exit 1
649649
fi
650650
651651
build_tvos:
652652
name: build-tvos-macos-latest
653653
needs: [check_and_prepare]
654-
runs-on: macos-latest
654+
runs-on: macos-12
655655
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled() && !failure()
656656
strategy:
657657
fail-fast: false
@@ -715,30 +715,30 @@ jobs:
715715
python scripts/gha/build_testapps.py --p tvOS \
716716
--t ${{ needs.check_and_prepare.outputs.apis }} \
717717
--output_directory "${{ github.workspace }}" \
718-
--artifact_name "tvos-macos-latest" \
718+
--artifact_name "tvos-macos-12" \
719719
--noadd_timestamp \
720720
--short_output_paths \
721721
${additional_flags[*]}
722722
- name: Prepare results summary artifact
723723
if: ${{ !cancelled() }}
724724
shell: bash
725725
run: |
726-
if [ ! -f build-results-tvos-macos-latest.log.json ]; then
727-
echo "__SUMMARY_MISSING__" > build-results-tvos-macos-latest.log.json
726+
if [ ! -f build-results-tvos-macos-12.log.json ]; then
727+
echo "__SUMMARY_MISSING__" > build-results-tvos-macos-12.log.json
728728
fi
729729
- name: Upload tvOS integration tests artifact
730730
uses: actions/upload-artifact@v3
731731
if: ${{ !cancelled() }}
732732
with:
733-
name: testapps-tvos-macos-latest
734-
path: testapps-tvos-macos-latest
733+
name: testapps-tvos-macos-12
734+
path: testapps-tvos-macos-12
735735
retention-days: ${{ env.artifactRetentionDays }}
736736
- name: Upload tvOS build results artifact
737737
uses: actions/upload-artifact@v3
738738
if: ${{ !cancelled() }}
739739
with:
740740
name: log-artifact
741-
path: build-results-tvos-macos-latest*
741+
path: build-results-tvos-macos-12*
742742
retention-days: ${{ env.artifactRetentionDays }}
743743
- name: Download log artifacts
744744
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
@@ -759,7 +759,7 @@ jobs:
759759
if: ${{ !cancelled() }}
760760
shell: bash
761761
run: |
762-
cat build-results-tvos-macos-latest.log
762+
cat build-results-tvos-macos-12.log
763763
if [[ "${{ job.status }}" != "success" ]]; then
764764
exit 1
765765
fi
@@ -858,7 +858,7 @@ jobs:
858858
test_android:
859859
name: test-android-${{ matrix.build_os }}-${{ matrix.android_device }}
860860
needs: [check_and_prepare, build_android]
861-
runs-on: macos-latest
861+
runs-on: macos-12
862862
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'Android') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
863863
strategy:
864864
fail-fast: false
@@ -963,7 +963,7 @@ jobs:
963963
test_ios:
964964
name: test-ios-macos-latest-${{ matrix.ios_device }}
965965
needs: [check_and_prepare, build_ios]
966-
runs-on: macos-latest
966+
runs-on: macos-12
967967
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
968968
strategy:
969969
fail-fast: false
@@ -980,7 +980,7 @@ jobs:
980980
uses: actions/download-artifact@v3
981981
with:
982982
path: testapps
983-
name: testapps-ios-macos-latest
983+
name: testapps-ios-macos-12
984984
- name: Setup python
985985
uses: actions/setup-python@v2
986986
with:
@@ -1009,7 +1009,7 @@ jobs:
10091009
run: |
10101010
python scripts/gha/test_simulator.py --testapp_dir testapps \
10111011
--ios_device "${{ matrix.ios_device }}" \
1012-
--logfile_name "ios-macos-latest-${{ matrix.ios_device }}" \
1012+
--logfile_name "ios-macos-12-${{ matrix.ios_device }}" \
10131013
--ci
10141014
- name: Install Cloud SDK
10151015
if: steps.get-device-type.outputs.device_type == 'real'
@@ -1022,23 +1022,23 @@ jobs:
10221022
python scripts/gha/restore_secrets.py --passphrase "${{ secrets.TEST_SECRET }}"
10231023
python scripts/gha/test_lab.py --testapp_dir testapps \
10241024
--ios_device "${{ matrix.ios_device }}" \
1025-
--logfile_name "ios-macos-latest-${{ matrix.ios_device }}" \
1025+
--logfile_name "ios-macos-12-${{ matrix.ios_device }}" \
10261026
--code_platform cpp \
10271027
--key_file scripts/gha-encrypted/gcs_key_file.json
10281028
- name: Prepare results summary artifact
10291029
if: ${{ !cancelled() }}
10301030
shell: bash
10311031
run: |
10321032
# If testapps do not exist, then it's a build error not test error.
1033-
if [ -d "testapps/testapps-ios-macos-latest" && ! -f "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json" ]; then
1034-
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json"
1033+
if [ -d "testapps/testapps-ios-macos-12" && ! -f "testapps/test-results-ios-macos-12-${{ matrix.ios_device }}.log.json" ]; then
1034+
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-ios-macos-12-${{ matrix.ios_device }}.log.json"
10351035
fi
10361036
- name: Upload iOS test results artifact
10371037
if: ${{ !cancelled() }}
10381038
uses: actions/upload-artifact@v3
10391039
with:
10401040
name: log-artifact
1041-
path: testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}*
1041+
path: testapps/test-results-ios-macos-12-${{ matrix.ios_device }}*
10421042
retention-days: ${{ env.artifactRetentionDays }}
10431043
- name: Download log artifacts
10441044
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
@@ -1059,15 +1059,15 @@ jobs:
10591059
if: ${{ !cancelled() }}
10601060
shell: bash
10611061
run: |
1062-
cat "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log"
1062+
cat "testapps/test-results-ios-macos-12-${{ matrix.ios_device }}.log"
10631063
if [[ "${{ job.status }}" != "success" ]]; then
10641064
exit 1
10651065
fi
10661066
10671067
test_tvos:
10681068
name: test-tvos-macos-latest-${{ matrix.tvos_device }}
10691069
needs: [check_and_prepare, build_tvos]
1070-
runs-on: macos-latest
1070+
runs-on: macos-12
10711071
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
10721072
strategy:
10731073
fail-fast: false
@@ -1084,7 +1084,7 @@ jobs:
10841084
uses: actions/download-artifact@v3
10851085
with:
10861086
path: testapps
1087-
name: testapps-tvos-macos-latest
1087+
name: testapps-tvos-macos-12
10881088
- name: Setup python
10891089
uses: actions/setup-python@v2
10901090
with:
@@ -1105,22 +1105,22 @@ jobs:
11051105
run: |
11061106
python scripts/gha/test_simulator.py --testapp_dir testapps \
11071107
--tvos_device "${{ matrix.tvos_device }}" \
1108-
--logfile_name "tvos-macos-latest-${{ matrix.tvos_device }}" \
1108+
--logfile_name "tvos-macos-12-${{ matrix.tvos_device }}" \
11091109
--ci
11101110
- name: Prepare results summary artifact
11111111
if: ${{ !cancelled() }}
11121112
shell: bash
11131113
run: |
11141114
# If testapps do not exist, then it's a build error not test error.
1115-
if [ -d "testapps/testapps-tvos-macos-latest" && ! -f "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json" ]; then
1116-
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json"
1115+
if [ -d "testapps/testapps-tvos-macos-12" && ! -f "testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}.log.json" ]; then
1116+
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}.log.json"
11171117
fi
11181118
- name: Upload tvOS test results artifact
11191119
if: ${{ !cancelled() }}
11201120
uses: actions/upload-artifact@v3
11211121
with:
11221122
name: log-artifact
1123-
path: testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}*
1123+
path: testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}*
11241124
retention-days: ${{ env.artifactRetentionDays }}
11251125
- name: Download log artifacts
11261126
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
@@ -1141,7 +1141,7 @@ jobs:
11411141
if: ${{ !cancelled() }}
11421142
shell: bash
11431143
run: |
1144-
cat "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log"
1144+
cat "testapps/test-results-tvos-macos-12-${{ matrix.tvos_device }}.log"
11451145
if [[ "${{ job.status }}" != "success" ]]; then
11461146
exit 1
11471147
fi

‎.github/workflows/ios.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ jobs:
3535
echo "::set-output name=matrix_xcode_version::$( python scripts/gha/print_matrix_configuration.py -w ios -k xcode_version ${EXPANDED_MATRIX_PARAM} )"
3636
3737
build:
38-
name: ios-macos-latest
39-
runs-on: macos-latest
38+
name: ios-${{ matrix.os }}-${{ matrix.xcode_version }}
39+
runs-on: ${{ matrix.os }}
4040
needs: prepare_matrix
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
xcode_verison: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
44+
os: [ 'macos-12' ]
45+
xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
4546
steps:
4647
- name: Store git credentials for all git commands
4748
# Forces all git commands to use authenticated https, to prevent throttling.
@@ -52,7 +53,7 @@ jobs:
5253
5354
- name: setup Xcode version (macos)
5455
if: runner.os == 'macOS'
55-
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_verison }}.app/Contents/Developer
56+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version }}.app/Contents/Developer
5657

5758
- uses: actions/checkout@v2
5859
with:

‎.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
jobs:
2626
update_dependencies:
2727
name: update-deps
28-
runs-on: macos-latest
28+
runs-on: macos-12
2929
steps:
3030
- name: Get token for firebase-workflow-trigger
3131
uses: tibdex/github-app-token@v1

0 commit comments

Comments
 (0)