DRTVWR-601: Use viewer-build-util/which-branch to determine branch.
(cherry picked from commit 2c5066f1fc)
master
parent
6e8d4f4846
commit
ff1741ceca
|
|
@ -100,10 +100,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
|
||||
|
|
@ -154,7 +161,7 @@ jobs:
|
|||
}
|
||||
repo_branch()
|
||||
{
|
||||
git -C "$1" branch | grep '^* ' | cut -c 3-
|
||||
echo "$AUTOBUILD_VCS_BRANCH"
|
||||
}
|
||||
record_dependencies_graph()
|
||||
{
|
||||
|
|
@ -202,11 +209,6 @@ 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue