Skip to content

Commit 726cc7d

Browse files
jonsimantovjonsimantov
authored
Change Xcode version from 12.2 to 12.4 to ensure GitHub support. (#774)
* Change Xcode version from 12.2 to 12.4 to ensure GitHub support. * Fix integration tests workflow to respect xcode_version in matrix.
1 parent 2362937 commit 726cc7d

File tree

5 files changed

+43
-11
lines changed

5 files changed

+43
-11
lines changed

‎.github/workflows/cpp-packaging.yml

Lines changed: 2 additions & 2 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.2 is the version we build the SDK with.
35+
# Xcode version 12.4 is the version we build the SDK with.
3636
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
37-
xcodeVersion: "12.2"
37+
xcodeVersion: "12.4"
3838
# LLVM version with ARM MachO support has no version number yet.
3939
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
4040
GITHUB_TOKEN: ${{ github.token }}

‎.github/workflows/desktop.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,13 @@ jobs:
7474
architecture: "x86"
7575
# Xcode excludes -- allow only one on osx and linux
7676
- os: ubuntu-latest
77-
xcode_version: "12.4"
77+
xcode_version: "11.7"
7878
- os: windows-latest
79-
xcode_version: "12.4"
79+
xcode_version: "11.7"
80+
- os: ubuntu-latest
81+
xcode_version: "12.5.1"
82+
- os: windows-latest
83+
xcode_version: "12.5.1"
8084
# arm64 is only for macos
8185
- os: ubuntu-latest
8286
architecture: "arm64"

‎.github/workflows/integration_tests.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
apis: ${{ steps.matrix_config.outputs.apis }}
6363
mobile_test_on: ${{ steps.matrix_config.outputs.mobile_test_on }}
6464
android_device: ${{ steps.matrix_config.outputs.android_device }}
65+
xcode_version: ${{ steps.matrix_config.outputs.xcode_version }}
6566
ios_device: ${{ steps.matrix_config.outputs.ios_device }}
6667
tvos_device: ${{ steps.matrix_config.outputs.tvos_device }}
6768
steps:
@@ -182,6 +183,7 @@ jobs:
182183
mobile_test_on=$( python scripts/gha/print_matrix_configuration.py -c -w integration_tests -k mobile_test_on -o "${{github.event.inputs.mobile_test_on}}")
183184
echo "::set-output name=mobile_test_on::${mobile_test_on}"
184185
echo "::set-output name=android_device::$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k android_device -t ${mobile_test_on} )"
186+
echo "::set-output name=xcode_version::$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k xcode_version)"
185187
echo "::set-output name=ios_device::$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k ios_device -t ${mobile_test_on} )"
186188
echo "::set-output name=tvos_device::$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k tvos_device -t ${mobile_test_on} )"
187189
- name: Update PR label and comment
@@ -208,6 +210,9 @@ jobs:
208210
os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
209211
ssl_variant: ${{ fromJson(needs.check_and_prepare.outputs.matrix_ssl) }}
210212
steps:
213+
- name: setup Xcode version (macos)
214+
if: runner.os == 'macOS'
215+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
211216
- uses: actions/checkout@v2
212217
with:
213218
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -387,6 +392,9 @@ jobs:
387392
matrix:
388393
os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
389394
steps:
395+
- name: setup Xcode version (macos)
396+
if: runner.os == 'macOS'
397+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
390398
- uses: actions/checkout@v2
391399
with:
392400
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -508,6 +516,9 @@ jobs:
508516
strategy:
509517
fail-fast: false
510518
steps:
519+
- name: setup Xcode version (macos)
520+
if: runner.os == 'macOS'
521+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
511522
- uses: actions/checkout@v2
512523
with:
513524
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -619,6 +630,9 @@ jobs:
619630
strategy:
620631
fail-fast: false
621632
steps:
633+
- name: setup Xcode version (macos)
634+
if: runner.os == 'macOS'
635+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
622636
- uses: actions/checkout@v2
623637
with:
624638
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -726,6 +740,9 @@ jobs:
726740
os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
727741
ssl_variant: ${{ fromJson(needs.check_and_prepare.outputs.matrix_ssl) }}
728742
steps:
743+
- name: setup Xcode version (macos)
744+
if: runner.os == 'macOS'
745+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
729746
- uses: actions/checkout@v2
730747
with:
731748
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -802,6 +819,9 @@ jobs:
802819
build_os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
803820
android_device: ${{ fromJson(needs.check_and_prepare.outputs.android_device) }}
804821
steps:
822+
- name: setup Xcode version (macos)
823+
if: runner.os == 'macOS'
824+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
805825
- uses: actions/checkout@v2
806826
with:
807827
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -897,6 +917,9 @@ jobs:
897917
matrix:
898918
ios_device: ${{ fromJson(needs.check_and_prepare.outputs.ios_device) }}
899919
steps:
920+
- name: setup Xcode version (macos)
921+
if: runner.os == 'macOS'
922+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
900923
- uses: actions/checkout@v2
901924
with:
902925
ref: ${{needs.check_and_prepare.outputs.github_ref}}
@@ -993,6 +1016,9 @@ jobs:
9931016
matrix:
9941017
tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }}
9951018
steps:
1019+
- name: setup Xcode version (macos)
1020+
if: runner.os == 'macOS'
1021+
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
9961022
- uses: actions/checkout@v2
9971023
with:
9981024
ref: ${{needs.check_and_prepare.outputs.github_ref}}

‎release_build_files/readme.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ Firebase Installations (stub) | firebase_installations.framework
371371
Firebase Cloud Messaging (stub) | firebase_messaging.framework
372372
| | firebase.framework
373373

374-
The provided libraries have been tested using Xcode 12.2. When building C++
374+
The provided libraries have been tested using Xcode 12.4. When building C++
375375
desktop apps on OS X, you will need to link the `gssapi_krb5` and `pthread`
376376
system libraries, as well as the `CoreFoundation`, `Foundation`, `GSS`, and
377377
`Security` OS X system frameworks (consult your compiler documentation for more
@@ -580,6 +580,8 @@ code.
580580
([#745](https://github.com/firebase/firebase-cpp-sdk/pull/745))
581581
- Messaging (Android): Fixed crash during initialization.
582582
([#760](https://github.com/firebase/firebase-cpp-sdk/pull/760))
583+
- General (iOS): iOS SDKs are now built using Xcode 12.4.
584+
- General (Desktop): macOS SDKs are now built using Xcode 12.4.
583585

584586

585587
### 8.7.0

‎scripts/gha/print_matrix_configuration.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@
7676
"build_type": ["Release", "Debug"],
7777
"architecture": ["x64", "x86", "arm64"],
7878
"msvc_runtime": ["static","dynamic"],
79-
"xcode_version": ["12.2"],
79+
"xcode_version": ["12.4"],
8080
"python_version": ["3.7"],
8181

8282
EXPANDED_KEY: {
8383
"os": ["ubuntu-latest", "macos-latest", "windows-latest"],
84-
"xcode_version": ["11.7", "12.2", "12.5"],
84+
"xcode_version": ["11.7", "12.4", "12.5.1"],
8585
}
8686
}
8787
},
@@ -112,7 +112,7 @@
112112
"msvc_runtime": ["dynamic"],
113113
"cpp_compiler_windows": ["VisualStudio2019"],
114114
"cpp_compiler_linux": ["clang-11.0"],
115-
"xcode_version": ["12"],
115+
"xcode_version": ["12.4"], # only the first one is used
116116
"ndk_version": ["r22b"],
117117
"platform_version": ["28"],
118118
"build_tools_version": ["28.0.3"],
@@ -138,10 +138,10 @@
138138

139139
"ios": {
140140
"matrix": {
141-
"xcode_version": ["12"],
141+
"xcode_version": ["12.4"],
142142

143143
EXPANDED_KEY: {
144-
"xcode_version": ["12", "12.4"]
144+
"xcode_version": ["12.4", "12.5.1"]
145145
}
146146
}
147147
},
@@ -173,7 +173,7 @@
173173
"simulator_min": {"type": "virtual", "name":"iPhone 6", "version":"11.4"},
174174
"simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"12.0"},
175175
"simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"14.4"},
176-
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.0"},
176+
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.3"},
177177
}
178178

179179

0 commit comments

Comments
 (0)