Merge branch 'main' into swift

firebase · Mar 13, 2024 · fb19ce4 · fb19ce4
2 parents 4bedd01 + fbd9f87
commit fb19ce4
Show file tree

Hide file tree

Showing 110 changed files with 1,061 additions and 492 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -54,7 +54,10 @@ jobs:
       - name: setup Xcode version (macos)
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
-
+      - name: Force Java 8 (macOS)
+        if: startsWith(matrix.os, 'macos')
+        shell: bash
+        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
       - name: Store git credentials for all git commands
         # Forces all git commands to use authenticated https, to prevent throttling.
         shell: bash

diff --git a/.github/workflows/build-report.yml b/.github/workflows/build-report.yml
@@ -3,7 +3,7 @@ name: Generate Test Report Table
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 15 * * *"  # 3pm UTC = 7am PST / 8am PDT, 6 hours after testapps run
+    - cron: "0 21 * * *"  # 9pm UTC = 1pm PST / 2pm PDT, 12 hours after testapps run
 
 env:
   GITHUB_TOKEN: ${{ github.token }}

diff --git a/.github/workflows/cpp-packaging.yml b/.github/workflows/cpp-packaging.yml
@@ -32,9 +32,9 @@ env:
   demumbleVer: "df938e45c2b0e064fb5323d88b692d03b451d271"
   # Use SHA256 for hashing files.
   hashCommand: "sha256sum"
-  # Xcode version 14.1 is the version we build the SDK with.
+  # Xcode version 15.1 is the version we build the SDK with.
   # Our MacOS runners will use the version in /Applications/Xcode_${xcodeVersion}.app
-  xcodeVersion: "14.1"
+  xcodeVersion: "15.1"
   # LLVM version with ARM MachO support has no version number yet.
   llvmVer: "5f187f0afaad33013ba03454c4749d99b1362534"
   GITHUB_TOKEN: ${{ github.token }}
@@ -79,13 +79,13 @@ jobs:
     if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-13]
         include:
         - os: ubuntu-20.04
           tools_platform: linux
           # Binutils 2.35.1 released Sep 19, 2020
           binutils_version: "2.35.1"
-        - os: macos-12
+        - os: macos-13
           tools_platform: darwin
           # Binutils 2.35.1 released Sep 19, 2020
           binutils_version: "2.35.1"
@@ -185,7 +185,7 @@ jobs:
 
   build_and_package_ios_tvos:
     name: build-and-package-ios-tvos
-    runs-on: macos-12
+    runs-on: macos-13
     if: ${{ github.event.inputs.downloadPublicVersion == '' && github.event.inputs.downloadPreviousRun == '' }}
     steps:
       - name: Store git credentials for all git commands
@@ -305,7 +305,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-20.04, macos-12]
+        os: [windows-latest, ubuntu-20.04, macos-13]
         build_type: ["Release", "Debug"]
         architecture: ["x64", "x86", "arm64"]
         msvc_runtime: ["static", "dynamic"]
@@ -325,21 +325,21 @@ jobs:
           vcpkg_triplet_suffix: "linux"
           additional_build_flags: ""
           sdk_platform: "linux"
-        - os: macos-12
+        - os: macos-13
           vcpkg_triplet_suffix: "osx"
           additional_build_flags: "--target_format libraries"
           sdk_platform: "darwin"
 
         exclude:
         - os: windows-latest
           linux_abi: "c++11"
-        - os: macos-12
+        - os: macos-13
           architecture: "x86"
-        - os: macos-12
+        - os: macos-13
           msvc_runtime: "dynamic"
-        - os: macos-12
+        - os: macos-13
           linux_abi: "c++11"
-        - os: macos-12
+        - os: macos-13
           build_type: "Debug"
         - os: ubuntu-20.04
           msvc_runtime: "dynamic"
@@ -492,7 +492,7 @@ jobs:
           suffix: '-x64-Debug-dynamic'
           runs_on_platform: ubuntu-20.04
         - sdk_platform: darwin
-          runs_on_platform: macos-12
+          runs_on_platform: macos-13
         exclude:
         - sdk_platform: windows
           suffix: ''

diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
@@ -72,10 +72,10 @@ jobs:
           # msvc_runtime excludes
           - os: ubuntu-20.04
             msvc_runtime: "dynamic"
-          - os: macos-12
+          - os: macos-13
             msvc_runtime: "dynamic"
           # architecture excluees
-          - os: macos-12
+          - os: macos-13
             architecture: "x86"
           # Xcode excludes -- allow only one on osx and linux
           - os: ubuntu-20.04