Skip to content
Snippets Groups Projects
Commit b782ab73 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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.
parent d10942ef
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,9 @@ jobs: ...@@ -33,6 +33,9 @@ jobs:
AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }} AUTOBUILD_GITHUB_TOKEN: ${{ secrets.SHARED_AUTOBUILD_GITHUB_TOKEN }}
AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables AUTOBUILD_INSTALLABLE_CACHE: ${{ github.workspace }}/.autobuild-installables
AUTOBUILD_VARIABLES_FILE: ${{ github.workspace }}/.build-variables/variables 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" AUTOBUILD_VSVER: "170"
DEVELOPER_DIR: ${{ matrix.developer_dir }} DEVELOPER_DIR: ${{ matrix.developer_dir }}
# Ensure that Linden viewer builds engage Bugsplat. # Ensure that Linden viewer builds engage Bugsplat.
...@@ -192,6 +195,11 @@ jobs: ...@@ -192,6 +195,11 @@ jobs:
fi fi
export PYTHON_COMMAND_NATIVE="$(native_path "$PYTHON_COMMAND")" 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 ./build.sh
# Each artifact is downloaded as a distinct .zip file. Multiple jobs # Each artifact is downloaded as a distinct .zip file. Multiple jobs
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment