diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:06 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2024-02-07 11:20:06 -0600 |
| commit | 78cc23f89ce01eff6531d4130bdb8016296043a6 (patch) | |
| tree | bc89602fc63bb40b15f76ce91b7cb6d33d4511d8 /.github/workflows | |
| parent | b0c7dc653dc730f1f95aa95fc6df876dfe7b04a0 (diff) | |
| parent | 7a5b0f5acf0b8aee3e73af0eb15d8c6930b98243 (diff) | |
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yaml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 849c10d62e..dee1ca24ab 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -33,6 +33,9 @@ jobs: AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }} AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.build-variables/variables + # Direct autobuild to store vcs_url, vcs_branch and vcs_revision in + # autobuild-package.xml. + AUTOBUILD_VCS_INFO: "true" AUTOBUILD_VSVER: "170" DEVELOPER_DIR: ${{ matrix.developer_dir }} # Ensure that Linden viewer builds engage Bugsplat. @@ -96,10 +99,17 @@ jobs: if: runner.os == 'Windows' run: choco install nsis-unicode + - name: Determine source branch + id: which-branch + uses: secondlife/viewer-build-util/which-branch@v1 + with: + token: ${{ github.token }} + - name: Build id: build shell: bash env: + AUTOBUILD_VCS_BRANCH: ${{ steps.which-branch.outputs.branch }} RUNNER_OS: ${{ runner.os }} run: | # set up things the viewer's build.sh script expects @@ -150,7 +160,7 @@ jobs: } repo_branch() { - git -C "$1" branch | grep '^* ' | cut -c 3- + echo "$AUTOBUILD_VCS_BRANCH" } record_dependencies_graph() { |