diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-03-07 16:44:21 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-03-07 16:44:21 +0800 |
| commit | 266e96605781960799dc5388cc1ac168432ff106 (patch) | |
| tree | 5f46ae7d39a8a954ea9f79dc7216cad6aca2ee6a /.github/workflows | |
| parent | 530ff898b00d1759ab4abb32dcf9767960ce7170 (diff) | |
| parent | bf949ce004c25917aabddd1cd24be812713e4602 (diff) | |
Merge branch '2024.12-ForeverFPS'
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/cla.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/tag-release.yaml | 7 |
3 files changed, 9 insertions, 4 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 diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index 65d1d43a83..24ee2de794 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -37,7 +37,12 @@ jobs: - name: Update Tag uses: actions/github-script@v7.0.1 with: - github-token: ${{ secrets.GITHUB_TOKEN }} + # use a real access token instead of GITHUB_TOKEN default. + # required so that the results of this tag creation can trigger the build workflow + # https://stackoverflow.com/a/71372524 + # https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow + # this token will need to be renewed anually in January + github-token: ${{ secrets.LL_TAG_RELEASE_TOKEN }} script: | github.rest.git.createRef({ owner: context.repo.owner, |