summaryrefslogtreecommitdiff
path: root/.github/workflows/build.yaml
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-12-18 10:59:03 -0500
committerNat Goodspeed <nat@lindenlab.com>2024-03-01 16:13:29 -0500
commit8590ce0533a4bc273b6c0094250fe31fc8e78f1f (patch)
tree19d41706cd9d548b3446311074c4f30d4f967e2a /.github/workflows/build.yaml
parentcfbef4e4f961cafaa004089e2055ff13de35b8dc (diff)
DRTVWR-601: Make autobuild set vcs_url, vcs_branch, vcs_revision
in viewer's autobuild-package.xml. Ensure that AUTOBUILD_VCS_BRANCH is set before the build. (cherry picked from commit b782ab73e640e434e4ed67fa8dfc951f09757585) (cherry picked from commit 6e8d4f48466a5bbad2fcc27bc2877a30e575d4ce)
Diffstat (limited to '.github/workflows/build.yaml')
-rw-r--r--.github/workflows/build.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 861f1567c6..f127ac3f0f 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -34,6 +34,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.
@@ -199,6 +202,11 @@ jobs:
fi
export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")"
+ # branch will be something like "origin/mybranch"
+ branch="$(git branch -r --contains ${{ github.event.pull_request.head.sha || github.sha }} | head -n 1)"
+ # strip off "origin/"
+ export AUTOBUILD_VCS_BRANCH="${branch#*/}"
+
./build.sh
# Each artifact is downloaded as a distinct .zip file. Multiple jobs