From b782ab73e640e434e4ed67fa8dfc951f09757585 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 18 Dec 2023 10:59:03 -0500
Subject: [PATCH] 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.
---
.github/workflows/build.yaml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 849c10d62e5..ad494cb3a49 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.
@@ -192,6 +195,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
--
GitLab