summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2024-08-22 15:48:37 -0700
committerBrad Linden <brad@lindenlab.com>2024-08-22 15:48:37 -0700
commit8a22c311c8746b68a0baba98a6ab8bd578536d6c (patch)
tree9abe3bd0fcd55e99fb8a99a0882a3a42be3f49a9
parent421ee5107f6f795b89c48b068d549022b05eba60 (diff)
parent1adf2d00ebd340dca72532585276279cb6911dfb (diff)
Merge remote-tracking branch 'origin/release/2024.08-DeltaFPS' into develop
-rw-r--r--.github/workflows/build.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 30f38ba3a3..2cb94c9c90 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -206,6 +206,7 @@ jobs:
# trigger an EDU build by including "edu" in the tag
edu=${{ github.ref_type == 'tag' && contains(github.ref_name, 'edu') }}
echo "ref_type=${{ github.ref_type }}, ref_name=${{ github.ref_name }}, edu='$edu'"
+ branch=$AUTOBUILD_VCS_BRANCH
if [[ "$edu" == "true" ]]
then
export viewer_channel="Second Life Release edu"
@@ -213,7 +214,6 @@ jobs:
then
export viewer_channel="Second Life Develop"
else
- branch=$AUTOBUILD_VCS_BRANCH
IFS='/' read -ra ba <<< "$branch"
prefix=${ba[0]}
if [ "$prefix" == "project" ]; then