Skip to content

Change Xcode version from 12.2 to 12.4 to ensure GitHub support. #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Dec 2, 2021
Merged

Change Xcode version from 12.2 to 12.4 to ensure GitHub support. #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
73f1ba6
Change Xcode version from 12.2 to 12.4 to ensure GitHub support.
jonsimantov Dec 1, 2021
598ba9d
Fix iOS workflows too.
jonsimantov Dec 1, 2021
8fbb364
Fix capitalization to look all fancy-like.
jonsimantov Dec 1, 2021
7cf60ac
Fix integration tests workflow to respect xcode_version in matrix.
jonsimantov Dec 1, 2021
66b67d6
Debug log
jonsimantov Dec 1, 2021
1989328
Fix typo
jonsimantov Dec 1, 2021
304e167
Remove extra array subscript
jonsimantov Dec 1, 2021
0477e8c
Fix yml
jonsimantov Dec 1, 2021
8eb03fe
Fix yml again
jonsimantov Dec 1, 2021
8146d93
Fix yml again again
jonsimantov Dec 1, 2021
03192ca
Move array access later in case we make it a proper matrix in the future
jonsimantov Dec 1, 2021
0371754
Add xcode setting to tvos
jonsimantov Dec 1, 2021
2bb2a09
Fix desktop test to not omit ubuntu.
jonsimantov Dec 1, 2021
5af1503
Change tvOS simulator version to 14.3, 14.0 is out of date.
jonsimantov Dec 2, 2021
8da9b3f
Also set xcode version on test machines.
jonsimantov Dec 2, 2021
8d9f01f
Revert "Also set xcode version on test machines."
jonsimantov Dec 2, 2021
7886108
Actually set the xcode version on test jobs
jonsimantov Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cpp-packaging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ env:
demumbleVer: "1.1.0"
# Use SHA256 for hashing files.
hashCommand: "sha256sum"
# Xcode version 12.2 is the version we build the SDK with.
# Xcode version 12.4 is the version we build the SDK with.
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
xcodeVersion: "12.2"
xcodeVersion: "12.4"
# LLVM version with ARM MachO support has no version number yet.
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
GITHUB_TOKEN: ${{ github.token }}
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,13 @@ jobs:
architecture: "x86"
# Xcode excludes -- allow only one on osx and linux
- os: ubuntu-latest
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why there's extra two entries?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes it so it doesn't repeat the linux/windows jobs even if the matrix contains xcode 11.7, 12.4, and 12.5.1. (previously it was omitting 12.4, which is the actual version we use now, so this swaps it to the others - previously there was a bug where 11.7 was missing here.)

Copy link
Contributor Author

@jonsimantov jonsimantov Dec 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify: the expanded matrix will have the following (simplified) list of targets:

  • macos - xcode 11.7
  • windows - xcode 11.7
  • ubuntu - xcode 11.7
  • macos - xcode 12.4
  • windows - xcode 12.4
  • ubuntu - xcode 12.4
  • macos - xcode 12.5.1
  • windows - xcode 12.5.1
  • ubuntu - xcode 12.5.1

These "excludes" entries ensure that only one set of ubuntu and windows will be run. And it can't exclude 12.4, because 12.4 is now the one that runs in the non-expanded matrix.

xcode_version: "12.4"
xcode_version: "11.7"
- os: windows-latest
xcode_version: "12.4"
xcode_version: "11.7"
- os: ubuntu-latest
xcode_version: "12.5.1"
- os: windows-latest
xcode_version: "12.5.1"
# arm64 is only for macos
- os: ubuntu-latest
architecture: "arm64"
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/integration_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ jobs:
apis: ${{ steps.matrix_config.outputs.apis }}
mobile_test_on: ${{ steps.matrix_config.outputs.mobile_test_on }}
android_device: ${{ steps.matrix_config.outputs.android_device }}
xcode_version: ${{ steps.matrix_config.outputs.xcode_version }}
ios_device: ${{ steps.matrix_config.outputs.ios_device }}
tvos_device: ${{ steps.matrix_config.outputs.tvos_device }}
steps:
Expand Down Expand Up @@ -182,6 +183,7 @@ jobs:
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}}")
echo "::set-output name=mobile_test_on::${mobile_test_on}"
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} )"
echo "::set-output name=xcode_version::$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k xcode_version)"
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} )"
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} )"
- name: Update PR label and comment
Expand All @@ -208,6 +210,9 @@ jobs:
os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
ssl_variant: ${{ fromJson(needs.check_and_prepare.outputs.matrix_ssl) }}
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -387,6 +392,9 @@ jobs:
matrix:
os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -508,6 +516,9 @@ jobs:
strategy:
fail-fast: false
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -619,6 +630,9 @@ jobs:
strategy:
fail-fast: false
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -726,6 +740,9 @@ jobs:
os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
ssl_variant: ${{ fromJson(needs.check_and_prepare.outputs.matrix_ssl) }}
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -802,6 +819,9 @@ jobs:
build_os: ${{ fromJson(needs.check_and_prepare.outputs.matrix_os) }}
android_device: ${{ fromJson(needs.check_and_prepare.outputs.android_device) }}
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -897,6 +917,9 @@ jobs:
matrix:
ios_device: ${{ fromJson(needs.check_and_prepare.outputs.ios_device) }}
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down Expand Up @@ -993,6 +1016,9 @@ jobs:
matrix:
tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }}
steps:
- name: setup Xcode version (macos)
if: runner.os == 'macOS'
run: sudo xcode-select -s /Applications/Xcode_${{ fromJson(needs.check_and_prepare.outputs.xcode_version)[0] }}.app/Contents/Developer
- uses: actions/checkout@v2
with:
ref: ${{needs.check_and_prepare.outputs.github_ref}}
Expand Down
4 changes: 3 additions & 1 deletion release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ Firebase Installations (stub) | firebase_installations.framework
Firebase Cloud Messaging (stub) | firebase_messaging.framework
| | firebase.framework

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


### 8.7.0
Expand Down
12 changes: 6 additions & 6 deletions scripts/gha/print_matrix_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@
"build_type": ["Release", "Debug"],
"architecture": ["x64", "x86", "arm64"],
"msvc_runtime": ["static","dynamic"],
"xcode_version": ["12.2"],
"xcode_version": ["12.4"],
"python_version": ["3.7"],

EXPANDED_KEY: {
"os": ["ubuntu-latest", "macos-latest", "windows-latest"],
"xcode_version": ["11.7", "12.2", "12.5"],
"xcode_version": ["11.7", "12.4", "12.5.1"],
}
}
},
Expand Down Expand Up @@ -112,7 +112,7 @@
"msvc_runtime": ["dynamic"],
"cpp_compiler_windows": ["VisualStudio2019"],
"cpp_compiler_linux": ["clang-11.0"],
"xcode_version": ["12"],
"xcode_version": ["12.4"], # only the first one is used
"ndk_version": ["r22b"],
"platform_version": ["28"],
"build_tools_version": ["28.0.3"],
Expand All @@ -138,10 +138,10 @@

"ios": {
"matrix": {
"xcode_version": ["12"],
"xcode_version": ["12.4"],

EXPANDED_KEY: {
"xcode_version": ["12", "12.4"]
"xcode_version": ["12.4", "12.5.1"]
}
}
},
Expand Down Expand Up @@ -173,7 +173,7 @@
"simulator_min": {"type": "virtual", "name":"iPhone 6", "version":"11.4"},
"simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"12.0"},
"simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"14.4"},
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.0"},
"tvos_simulator": {"type": "virtual", "name":"Apple TV", "version":"14.3"},
}


Expand Down