8000 Merge branch 'main' into swift · compnerd/firebase-cpp-sdk@fb19ce4 · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit fb19ce4

Browse files
jonsimantovjonsimantov
authored
Merge branch 'main' into swift
2 parents 4bedd01 + fbd9f87 commit fb19ce4

File tree

110 files changed

+1061
-492
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1061
-492
lines changed

‎.github/workflows/android.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ jobs:
5454
- name: setup Xcode version (macos)
5555
if: runner.os == 'macOS'
5656
run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
57-
57+
- name: Force Java 8 (macOS)
58+
if: startsWith(matrix.os, 'macos')
59+
shell: bash
60+
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
5861
- name: Store git credentials for all git commands
5962
# Forces all git commands to use authenticated https, to prevent throttling.
6063
shell: bash

‎.github/workflows/build-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Generate Test Report Table
33
on:
44
workflow_dispatch:
55
schedule:
6-
- cron: "0 15 * * *" # 3pm UTC = 7am PST / 8am PDT, 6 hours after testapps run
6+
- cron: "0 21 * * *" # 9pm UTC = 1pm PST / 2pm PDT, 12 hours after testapps run
77

88
env:
99
GITHUB_TOKEN: ${{ github.token }}

‎.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 14.1 is the version we build the SDK with.
35+
# Xcode version 15.1 is the version we build the SDK with.
3636
# Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
37-
xcodeVersion: "14.1"
37+
xcodeVersion: "15.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-20.04, macos-12]
82+
os: [ubuntu-20.04, macos-13]
8383
include:
8484
- os: ubuntu-20.04
8585
tools_platform: linux
8686
# Binutils 2.35.1 released Sep 19, 2020
8787
binutils_version: "2.35.1"
88-
- os: macos-12
88+
- os: macos-13
8989
tools_platform: darwin
9090
# Binutils 2.35.1 released Sep 19, 2020
9191
binutils_version: "2.35.1"
@@ -185,7 +185,7 @@ jobs:
185185

186186
build_and_package_ios_tvos:
187187
name: build-and-package-ios-tvos
188-
runs-on: macos-12
188+
runs-on: macos-13
189189
if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
190190
steps:
191191
- name: Store git credentials for all git commands
@@ -305,7 +305,7 @@ jobs:
305305
strategy:
306306
fail-fast: false
307307
matrix:
308-
os: [windows-latest, ubuntu-20.04, macos-12]
308+
os: [windows-latest, ubuntu-20.04, macos-13]
309309
build_type: ["Release", "Debug"]
310310
architecture: ["x64", "x86", "arm64"]
311311
msvc_runtime: ["static", "dynamic"]
@@ -325,21 +325,21 @@ jobs:
325325
vcpkg_triplet_suffix: "linux"
326326
additional_build_flags: ""
327327
sdk_platform: "linux"
328-
- os: macos-12
328+
- os: macos-13
329329
vcpkg_triplet_suffix: "osx"
330330
additional_build_flags: "--target_format libraries"
331331
sdk_platform: "darwin"
332332

333333
exclude:
334334
- os: windows-latest
335335
linux_abi: "c++11"
336-
- os: macos-12
336+
- os: macos-13
337337
architecture: "x86"
338-
- os: macos-12
338+
- os: macos-13
339339
msvc_runtime: "dynamic"
340-
- os: macos-12
340+
- os: macos-13
341341
linux_abi: "c++11"
342-
- os: macos-12
342+
- os: macos-13
343343
build_type: "Debug"
344344
- os: ubuntu-20.04
345345
msvc_runtime: "dynamic"
@@ -492,7 +492,7 @@ jobs:
492492
suffix: '-x64-Debug-dynamic'
493493
runs_on_platform: ubuntu-20.04
494494
- sdk_platform: darwin
495-
runs_on_platform: macos-12
495+
runs_on_platform: macos-13
496496
exclude:
497497
- sdk_platform: windows
498498
suffix: ''

‎.github/workflows/desktop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ jobs:
7272
# msvc_runtime excludes
7373
- os: ubuntu-20.04
7474
msvc_runtime: "dynamic"
75-
- os: macos-12
75+
- os: macos-13
7676
msvc_runtime: "dynamic"
7777
# architecture excluees
78-
- os: macos-12
78+
- os: macos-13
7979
architecture: "x86"
8080
# Xcode excludes -- allow only one on osx and linux
8181
- os: ubuntu-20.04

0 commit comments

Comments
 (0)
0