Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
env:
CCACHE_DIR: ${{ github.workspace }}/ccache_dir
GITHUB_TOKEN: ${{ github.token }}
xcodeVersion: "16.2" # Only affects Mac runners, and only for prerequisites.
xcodeVersion: "16.3" # Only affects Mac runners, and only for prerequisites.

concurrency:
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cpp-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ env:
demumbleVer: "df938e45c2b0e064fb5323d88b692d03b451d271"
# Use SHA256 for hashing files.
hashCommand: "sha256sum"
# Xcode version 16.2 is the version we build the SDK with.
# Xcode version 16.3 is the version we build the SDK with.
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
xcodeVersion: "16.2"
xcodeVersion: "16.3"
# LLVM version with ARM MachO support has no version number yet.
llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
GITHUB_TOKEN: ${{ github.token }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ env:
triggerLabelFull: "tests-requested: full"
triggerLabelQuick: "tests-requested: quick"
pythonVersion: '3.8'
xcodeVersion: '16.2'
xcodeVersion: '16.3'
logArtifactRetentionDays: 90
binaryArtifactRetentionDays: 7
GITHUB_TOKEN: ${{ github.token }}
Expand Down
2 changes: 1 addition & 1 deletion release_build_files/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ Firebase Cloud Messaging (stub) | firebase_messaging.framework
User Messaging Platform (stub) | libfirebase_ump.a
| | libfirebase_app.a

The provided libraries have been tested using Xcode 16.2. When building C++
The provided libraries have been tested using Xcode 16.3. 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
10 changes: 5 additions & 5 deletions scripts/gha/print_matrix_configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@
"build_type": ["Release", "Debug"],
"architecture": ["x64", "x86", "arm64"],
"msvc_runtime": ["static","dynamic"],
"xcode_version": ["16.2"],
"xcode_version": ["16.3"],
"python_version": ["3.8"],

EXPANDED_KEY: {
"os": ["ubuntu-22.04", "macos-14", "windows-latest"],
"xcode_version": ["16.2"],
"xcode_version": ["16.3"],
}
Comment on lines 83 to 86

Choose a reason for hiding this comment

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

medium

The xcode_version is already defined in the base matrix for the desktop workflow on line 80. This entry in the EXPANDED_KEY block is redundant and can be removed to improve maintainability. The script's logic will fall back to the base matrix value if it's not found here.

      EXPANDED_KEY: {
        "os": ["ubuntu-22.04", "macos-14", "windows-latest"]
      }

}
},
Expand Down Expand Up @@ -113,7 +113,7 @@
"msvc_runtime": ["dynamic"],
"cpp_compiler_windows": ["VisualStudio2019"],
"cpp_compiler_linux": ["clang-11.0"],
"xcode_version": ["16.2"], # only the first one is used
"xcode_version": ["16.3"], # only the first one is used
"ndk_version": ["r22b"],
"platform_version": ["28"],
"build_tools_version": ["28.0.3"],
Expand Down Expand Up @@ -141,10 +141,10 @@

"ios": {
"matrix": {
"xcode_version": ["16.2"],
"xcode_version": ["16.3"],

EXPANDED_KEY: {
"xcode_version": ["16.2"]
"xcode_version": ["16.3"]
}
Comment on lines 146 to 148

Choose a reason for hiding this comment

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

medium

The xcode_version is already defined in the base matrix for the ios workflow on line 144. This makes the EXPANDED_KEY block redundant, as it only contains this duplicated version. The entire block can be removed to simplify the configuration.

}
},
Expand Down
Loading