Skip to content

Commit d5e9867

Browse files
committed
Update mac version
1 parent 3d15801 commit d5e9867

File tree

8 files changed

+43
-43
lines changed

8 files changed

+43
-43
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
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: "16.3" # Only affects Mac runners, and only for prerequisites.
16+
xcodeVersion: "16.4" # Only affects Mac runners, and only for prerequisites.
1717

1818
concurrency:
1919
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}
@@ -57,7 +57,7 @@ jobs:
5757
- os: ubuntu-22.04
5858
architecture: arm64
5959
# Do not attempt to use x64 on Mac.
60-
- os: macos-14
60+
- os: macos-15
6161
architecture: x64
6262
steps:
6363
- uses: lukka/get-cmake@latest

.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: "df938e45c2b0e064fb5323d88b692d03b451d271"
3333
# Use SHA256 for hashing files.
3434
hashCommand: "sha256sum"
35-
# Xcode version 16.3 is the version we build the SDK with.
35+
# Xcode version 16.4 is the version we build the SDK with.
3636
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
37-
xcodeVersion: "16.3"
37+
xcodeVersion: "16.4"
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-22.04, macos-14]
82+
os: [ubuntu-22.04, macos-15]
8383
include:
8484
- os: ubuntu-22.04
8585
tools_platform: linux
8686
# Binutils 2.35.1 released Sep 19, 2020
8787
binutils_version: "2.35.1"
88-
- os: macos-14
88+
- os: macos-15
8989
tools_platform: darwin
9090
# Binutils 2.35.1 released Sep 19, 2020
9191
binutils_version: "2.35.1"
@@ -188,7 +188,7 @@ jobs:
188188

189189
build_and_package_ios_tvos:
190190
name: build-and-package-ios-tvos
191-
runs-on: macos-14
191+
runs-on: macos-15
192192
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
193193
steps:
194194
- uses: lukka/get-cmake@latest
@@ -317,7 +317,7 @@ jobs:
317317
strategy:
318318
fail-fast: false
319319
matrix:
320-
os: [windows-latest, ubuntu-22.04, macos-14]
320+
os: [windows-latest, ubuntu-22.04, macos-15]
321321
build_type: ["Release", "Debug"]
322322
architecture: ["x64", "x86", "arm64"]
323323
msvc_runtime: ["static", "dynamic"]
@@ -335,21 +335,21 @@ jobs:
335335
vcpkg_triplet_suffix: "linux"
336336
additional_build_flags: ""
337337
sdk_platform: "linux"
338-
- os: macos-14
338+
- os: macos-15
339339
vcpkg_triplet_suffix: "osx"
340340
additional_build_flags: "--target_format libraries"
341341
sdk_platform: "darwin"
342342

343343
exclude:
344344
- os: windows-latest
345345
linux_abi: "c++11"
346-
- os: macos-14
346+
- os: macos-15
347347
architecture: "x86"
348-
- os: macos-14
348+
- os: macos-15
349349
msvc_runtime: "dynamic"
350-
- os: macos-14
350+
- os: macos-15
351351
linux_abi: "c++11"
352-
- os: macos-14
352+
- os: macos-15
353353
build_type: "Debug"
354354
- os: ubuntu-22.04
355355
msvc_runtime: "dynamic"
@@ -504,7 +504,7 @@ jobs:
504504
suffix: '-x64-Debug-dynamic'
505505
runs_on_platform: ubuntu-22.04
506506
- sdk_platform: darwin
507-
runs_on_platform: macos-14
507+
runs_on_platform: macos-15
508508
exclude:
509509
- sdk_platform: windows
510510
suffix: ''

.github/workflows/desktop.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@ jobs:
7272
# msvc_runtime excludes
7373
- os: ubuntu-22.04
7474
msvc_runtime: "dynamic"
75-
- os: macos-14
75+
- os: macos-15
7676
msvc_runtime: "dynamic"
7777
# architecture excluees
78-
- os: macos-14
78+
- os: macos-15
7979
architecture: "x86"
80-
- os: macos-14
80+
- os: macos-15
8181
architecture: "x64"
8282
# Xcode excludes -- allow only one on osx and linux
8383
- os: ubuntu-22.04

.github/workflows/integration_tests.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
required: true
2222
operating_systems:
2323
description: 'CSV of VMs to run on'
24-
default: 'ubuntu-22.04,windows-latest,macos-14'
24+
default: 'ubuntu-22.04,windows-latest,macos-15'
2525
required: true
2626
desktop_ssl_variants:
2727
description: 'CSV of desktop SSL variants to use'
@@ -49,7 +49,7 @@ env:
4949
triggerLabelFull: "tests-requested: full"
5050
triggerLabelQuick: "tests-requested: quick"
5151
pythonVersion: '3.8'
52-
xcodeVersion: '16.3'
52+
xcodeVersion: '16.4'
5353
logArtifactRetentionDays: 90
5454
binaryArtifactRetentionDays: 7
5555
GITHUB_TOKEN: ${{ github.token }}
@@ -200,7 +200,7 @@ jobs:
200200
# at 3am PST/4am PDT. Running firestore desktop integration test aginst tip-of-tree ios repo
201201
echo "::warning ::Running against Firestore tip-of-tree"
202202
matrix_platform="Desktop"
203-
matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-22.04,macos-14")
203+
matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "ubuntu-22.04,macos-15")
204204
else
205205
matrix_platform=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k platform -o "${{github.event.inputs.platforms}}" --apis ${apis} )
206206
matrix_os=$( python scripts/gha/print_matrix_configuration.py -w integration_tests ${TEST_MATRIX_PARAM} -k os -o "${{github.event.inputs.operating_systems}}")
@@ -267,7 +267,7 @@ jobs:
267267
- os: ubuntu-22.04
268268
arch: arm64
269269
# Do not attempt to use x86 on Mac.
270-
- os: macos-14
270+
- os: macos-15
271271
arch: x86
272272
# Until we support building openssl from source, we can't use the
273273
# system's openssl when cross-compiling, except on Linux. Builds on Linux
@@ -276,7 +276,7 @@ jobs:
276276
- os: windows-latest
277277
ssl_variant: openssl
278278
arch: x86
279-
- os: macos-14
279+
- os: macos-15
280280
ssl_variant: openssl
281281
arch: x64
282282
steps:
@@ -538,7 +538,7 @@ jobs:
538538
strategy:
539539
fail-fast: false
540540
matrix:
541-
os: [macos-14]
541+
os: [macos-15]
542542
steps:
543543
- uses: lukka/get-cmake@latest
544544
with:
@@ -646,7 +646,7 @@ jobs:
646646
strategy:
647647
fail-fast: false
648648
matrix:
649-
os: [macos-14]
649+
os: [macos-15]
650650
steps:
651651
- uses: lukka/get-cmake@latest
652652
with:
@@ -766,7 +766,7 @@ jobs:
766766
- os: ubuntu-22.04
767767
arch: arm64
768768
# Do not attempt to use x86 on Mac.
769-
- os: macos-14
769+
- os: macos-15
770770
arch: x86
771771
# Until we support building openssl from source, we can't use the
772772
# system's openssl when cross-compiling, except on Linux. Builds on Linux
@@ -775,7 +775,7 @@ jobs:
775775
- os: windows-latest
776776
ssl_variant: openssl
777777
arch: x86
778-
- os: macos-14
778+
- os: macos-15
779779
ssl_variant: openssl
780780
arch: x64
781781
steps:
@@ -1007,7 +1007,7 @@ jobs:
10071007
test_ios:
10081008
name: test-ios-${{ matrix.build_os }}-${{ matrix.ios_device }}-${{ matrix.test_type }}
10091009
needs: [check_and_prepare, build_ios]
1010-
runs-on: macos-14
1010+
runs-on: macos-15
10111011
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'iOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
10121012
strategy:
10131013
fail-fast: false
@@ -1021,7 +1021,7 @@ jobs:
10211021
test_type: "uitest"
10221022
- ios_device: "ios_latest"
10231023
test_type: "uitest"
1024-
build_os: [macos-14]
1024+
build_os: [macos-15]
10251025
steps:
10261026
- uses: actions/checkout@v3
10271027
with:
@@ -1186,13 +1186,13 @@ jobs:
11861186
test_tvos:
11871187
name: test-tvos-${{ matrix.build_os }}-${{ matrix.tvos_device }}
11881188
needs: [check_and_prepare, build_tvos]
1189-
runs-on: macos-14
1189+
runs-on: macos-15
11901190
if: contains(needs.check_and_prepare.outputs.matrix_platform, 'tvOS') && needs.check_and_prepare.outputs.apis != '' && !cancelled()
11911191
strategy:
11921192
fail-fast: false
11931193
matrix:
11941194
tvos_device: ${{ fromJson(needs.check_and_prepare.outputs.tvos_device) }}
1195-
build_os: [macos-14]
1195+
build_os: [macos-15]
11961196
steps:
11971197
- uses: actions/checkout@v3
11981198
with:

.github/workflows/ios.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
os: [ 'macos-14' ]
44+
os: [ 'macos-15' ]
4545
xcode_version: ${{ fromJson(needs.prepare_matrix.outputs.matrix_xcode_version) }}
4646
steps:
4747
- uses: lukka/get-cmake@latest

.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ env:
2727
jobs:
2828
update_dependencies:
2929
name: update-deps
30-
runs-on: macos-14
30+
runs-on: macos-15
3131
steps:
3232
- name: Get token for firebase-workflow-trigger
3333
uses: tibdex/github-app-token@v1

release_build_files/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ Firebase Cloud Messaging (stub) | firebase_messaging.framework
408408
User Messaging Platform (stub) | libfirebase_ump.a
409409
| | libfirebase_app.a
410410

411-
The provided libraries have been tested using Xcode 16.3. When building C++
411+
The provided libraries have been tested using Xcode 16.4. When building C++
412412
desktop apps on OS X, you will need to link the `gssapi_krb5` and `pthread`
413413
system libraries, as well as the `CoreFoundation`, `Foundation`, `GSS`, and
414414
`Security` OS X system frameworks (consult your compiler documentation for more

scripts/gha/print_matrix_configuration.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,35 +73,35 @@
7373
PARAMETERS = {
7474
"desktop": {
7575
"matrix": {
76-
"os": ["ubuntu-22.04", "macos-14"],
76+
"os": ["ubuntu-22.04", "macos-15"],
7777
"build_type": ["Release", "Debug"],
7878
"architecture": ["x64", "x86", "arm64"],
7979
"msvc_runtime": ["static","dynamic"],
80-
"xcode_version": ["16.3"],
80+
"xcode_version": ["16.4"],
8181
"python_version": ["3.8"],
8282

8383
EXPANDED_KEY: {
84-
"os": ["ubuntu-22.04", "macos-14", "windows-latest"],
85-
"xcode_version": ["16.3"],
84+
"os": ["ubuntu-22.04", "macos-15", "windows-latest"],
85+
"xcode_version": ["16.4"],
8686
}
8787
}
8888
},
8989

9090
"android": {
9191
"matrix": {
92-
"os": ["ubuntu-22.04", "macos-14", "windows-latest"],
92+
"os": ["ubuntu-22.04", "macos-15", "windows-latest"],
9393
"architecture": ["x64", "arm64"],
9494
"python_version": ["3.8"],
9595

9696
EXPANDED_KEY: {
97-
"os": ["ubuntu-22.04", "macos-14", "windows-latest"]
97+
"os": ["ubuntu-22.04", "macos-15", "windows-latest"]
9898
}
9999
}
100100
},
101101

102102
"integration_tests": {
103103
"matrix": {
104-
"os": ["ubuntu-22.04", "macos-14", "windows-latest"],
104+
"os": ["ubuntu-22.04", "macos-15", "windows-latest"],
105105
"platform": ["Desktop", "Android", "iOS", "tvOS"],
106106
"ssl_lib": ["openssl"],
107107
"android_device": ["android_target", "emulator_ftl_target"],
@@ -113,7 +113,7 @@
113113
"msvc_runtime": ["dynamic"],
114114
"cpp_compiler_windows": ["VisualStudio2019"],
115115
"cpp_compiler_linux": ["clang-11.0"],
116-
"xcode_version": ["16.3"], # only the first one is used
116+
"xcode_version": ["16.4"], # only the first one is used
117117
"ndk_version": ["r22b"],
118118
"platform_version": ["28"],
119119
"build_tools_version": ["28.0.3"],
@@ -141,10 +141,10 @@
141141

142142
"ios": {
143143
"matrix": {
144-
"xcode_version": ["16.3"],
144+
"xcode_version": ["16.4"],
145145

146146
EXPANDED_KEY: {
147-
"xcode_version": ["16.3"]
147+
"xcode_version": ["16.4"]
148148
}
149149
}
150150
},

0 commit comments

Comments
 (0)