diff options
| author | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-03-11 22:44:49 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@geenzo.com> | 2025-03-11 22:44:49 -0400 |
| commit | e0d14e02e152b4e75ff8bdd974677f9669163d68 (patch) | |
| tree | 3379d14c9c5d8c188d2fb716e61edd09fc1219a9 /.github | |
| parent | 179b29252d8bb28e11686a1852c8e8ffcd98ecc0 (diff) | |
| parent | b50ad90febda24d2296541f46ea1a129232aad70 (diff) | |
Merge branch 'release/2025.03' into rye/forevermac
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/cla.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7d6bcd2bc4..60ad7e8fe5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -42,7 +42,7 @@ jobs: needs: setup strategy: matrix: - runner: [windows-large, macos-12-large] + runner: [windows-large, macos-15-xlarge] configuration: ${{ fromJSON(needs.setup.outputs.configurations) }} runs-on: ${{ matrix.runner }} outputs: @@ -64,7 +64,7 @@ jobs: # autobuild-package.xml. AUTOBUILD_VCS_INFO: "true" AUTOBUILD_VSVER: "170" - DEVELOPER_DIR: "/Applications/Xcode_14.0.1.app/Contents/Developer" + DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer" # Ensure that Linden viewer builds engage Bugsplat. BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }} build_coverity: false diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml index 013adc9ca8..7866f943b5 100644 --- a/.github/workflows/cla.yaml +++ b/.github/workflows/cla.yaml @@ -23,4 +23,4 @@ jobs: path-to-signatures: signatures.json remote-organization-name: secondlife remote-repository-name: cla-signatures - allowlist: callum@mbp.localdomain + allowlist: callum@mbp.localdomain,rye@lindenlab.com |