From c2730b4fffe580bc99f29f1ba37aa45427f99b93 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:44:59 +0100
Subject: https://github.com/secondlife/viewer/issues/1286 - determine
 viewer_channel from branch name in builds

---
 .github/workflows/build.yaml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1dd2c1d5df..3abb43b2b2 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,7 +5,7 @@ on:
   pull_request:
   push:
     branches: ["main", "release/*", "project/*"]
-    tags: ["Second_Life_*"]
+    tags: ["Second_Life*"]
 
 jobs:
   build:
@@ -170,13 +170,18 @@ jobs:
           # seen before, so numerous tests don't know about it.
           [[ "$arch" == "MINGW6" ]] && arch=CYGWIN
           export AUTOBUILD="$(which autobuild)"
-          # Build with a tag like "Second_Life_Project_Shiny#abcdef0" to get a
-          # viewer channel "Second Life Project Shiny" (ignoring "#hash",
-          # needed to disambiguate tags).
-          if [[ "$GITHUB_REF_TYPE" == "tag" && "${GITHUB_REF_NAME:0:12}" == "Second_Life_" ]]
-          then viewer_channel="${GITHUB_REF_NAME%#*}"
-               export viewer_channel="${viewer_channel//_/ }"
-          else export viewer_channel="Second Life Test"
+
+          # determine the viewer channel from the branch name
+          IFS='/' read -ra ba <<< "$AUTOBUILD_VCS_BRANCH"
+          prefix=${ba[0]}
+          if [ "$prefix" == "project" ]; then
+              proj_name=$(echo ${ba[1]} | sed -e 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')
+              export viewer_channel="Second Life Project $proj_name"
+          elif  [ "$prefix" == "release" ] || [ "$prefix" == "main" ];
+          then
+              export viewer_channel="Second Life Release"
+          else
+              export viewer_channel="Second Life Test"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
 
@@ -326,7 +331,8 @@ jobs:
   release:
     needs: [sign-and-package-windows, sign-and-package-mac]
     runs-on: ubuntu-latest
-    if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life_')
+      # Build with a tag like "Second_Life#abcdef0" to generate a release page (used for builds we are planning to deploy).
+    if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life')
     steps:
       - uses: actions/download-artifact@v3
         with:
-- 
cgit v1.2.3


From f39987f3828fca4520db335582daadd9bc484255 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Fri, 19 Apr 2024 19:47:46 +0100
Subject: https://github.com/secondlife/viewer/issues/1286 - branch var from
 github.repository

---
 .github/workflows/build.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3abb43b2b2..f948669f32 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -172,10 +172,12 @@ jobs:
           export AUTOBUILD="$(which autobuild)"
 
           # determine the viewer channel from the branch name
-          IFS='/' read -ra ba <<< "$AUTOBUILD_VCS_BRANCH"
-          prefix=${ba[0]}
+          branch=${{ github.repository }}
+          IFS='/' read -ra ba <<< $branch
+          username=${ba[0]}
+          prefix=${ba[1]}
           if [ "$prefix" == "project" ]; then
-              proj_name=$(echo ${ba[1]} | sed -e 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')
+              proj_name=$(echo ${ba[2]} | sed -e 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')
               export viewer_channel="Second Life Project $proj_name"
           elif  [ "$prefix" == "release" ] || [ "$prefix" == "main" ];
           then
@@ -184,7 +186,7 @@ jobs:
               export viewer_channel="Second Life Test"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
-
+          exit 1
           # On windows we need to point the build to the correct python
           # as neither CMake's FindPython nor our custom Python.cmake module
           # will resolve the correct interpreter location.
-- 
cgit v1.2.3


From a65de9354196984fc78b82a7505723ab7f916f97 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Fri, 19 Apr 2024 19:51:19 +0100
Subject: https://github.com/secondlife/viewer/issues/1286 - branch var from
 github.repository

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f948669f32..20078f2e00 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -173,6 +173,7 @@ jobs:
 
           # determine the viewer channel from the branch name
           branch=${{ github.repository }}
+          echo "branch=$branch" >> "$GITHUB_OUTPUT"
           IFS='/' read -ra ba <<< $branch
           username=${ba[0]}
           prefix=${ba[1]}
@@ -186,7 +187,6 @@ jobs:
               export viewer_channel="Second Life Test"
           fi
           echo "viewer_channel=$viewer_channel" >> "$GITHUB_OUTPUT"
-          exit 1
           # On windows we need to point the build to the correct python
           # as neither CMake's FindPython nor our custom Python.cmake module
           # will resolve the correct interpreter location.
-- 
cgit v1.2.3


From 6ca4dfdb56d0107368a09af2b089c24d32e7108d Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Fri, 19 Apr 2024 16:16:26 -0400
Subject: Update build.yaml

---
 .github/workflows/build.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 20078f2e00..ee02ed58e8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -59,8 +59,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}    
+          
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+        
       - name: Setup python
         uses: actions/setup-python@v4
         with:
-- 
cgit v1.2.3


From 65495ba7655cbe17d282536a8c2a21d2ac29de23 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Wed, 1 May 2024 16:42:09 +0100
Subject: set viewer channel from branch

---
 .github/workflows/build.yaml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 813b6a96ef..42d6562db6 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -59,11 +59,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}    
-          
-      - name: Dump GitHub context
-        env:
-          GITHUB_CONTEXT: ${{ toJson(github) }}
-        run: echo "$GITHUB_CONTEXT"
         
       - name: Setup python
         uses: actions/setup-python@v5
@@ -183,13 +178,12 @@ jobs:
           export AUTOBUILD="$(which autobuild)"
 
           # determine the viewer channel from the branch name
-          branch=${{ github.repository }}
+          branch=$AUTOBUILD_VCS_BRANCH
           echo "branch=$branch" >> "$GITHUB_OUTPUT"
           IFS='/' read -ra ba <<< $branch
-          username=${ba[0]}
-          prefix=${ba[1]}
+          prefix=${ba[0]}
           if [ "$prefix" == "project" ]; then
-              proj_name=$(echo ${ba[2]} | sed -e 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')
+              proj_name=$(echo ${ba[1]} | sed -e 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')
               export viewer_channel="Second Life Project $proj_name"
           elif  [ "$prefix" == "release" ] || [ "$prefix" == "main" ];
           then
-- 
cgit v1.2.3


From 7f23f160d7520034afd8c3be8a184eac1716227a Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Wed, 1 May 2024 17:51:44 +0100
Subject: trim trailing whitespace

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 42d6562db6..d318d2eaf3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -58,8 +58,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}    
-        
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
       - name: Setup python
         uses: actions/setup-python@v5
         with:
-- 
cgit v1.2.3


From eb0f963b46c68ad8faee133996599ba97b54d034 Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Thu, 2 May 2024 09:48:26 -0400
Subject: Update build.yaml

---
 .github/workflows/build.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d318d2eaf3..e4952d9493 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -179,13 +179,13 @@ jobs:
 
           # determine the viewer channel from the branch name
           branch=$AUTOBUILD_VCS_BRANCH
-          echo "branch=$branch" >> "$GITHUB_OUTPUT"
           IFS='/' read -ra ba <<< $branch
           prefix=${ba[0]}
           if [ "$prefix" == "project" ]; then
-              proj_name=$(echo ${ba[1]} | sed -e 's/_/ /g' | awk '{for(i=1;i<=NF;i++) $i=toupper(substr($i,1,1)) tolower(substr($i,2));}1')
-              export viewer_channel="Second Life Project $proj_name"
-          elif  [ "$prefix" == "release" ] || [ "$prefix" == "main" ];
+              IFS='_' read -ra prj << "${ba[1]}"
+              # uppercase first letter of each word
+              export viewer_channel="Second Life Project ${prj[*]^}"
+          elif   [ "$prefix" == "release" || "$prefix" == "main" ];
           then
               export viewer_channel="Second Life Release"
           else
-- 
cgit v1.2.3


From 6eeef10cda794607c8fbed6fe89179c09a42224b Mon Sep 17 00:00:00 2001
From: Vir Linden <60274682+vir-linden@users.noreply.github.com>
Date: Thu, 2 May 2024 10:08:46 -0400
Subject: Update build.yaml

---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e4952d9493..4785273b78 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -182,10 +182,10 @@ jobs:
           IFS='/' read -ra ba <<< $branch
           prefix=${ba[0]}
           if [ "$prefix" == "project" ]; then
-              IFS='_' read -ra prj << "${ba[1]}"
+              IFS='_' read -ra prj <<< "${ba[1]}"
               # uppercase first letter of each word
               export viewer_channel="Second Life Project ${prj[*]^}"
-          elif   [ "$prefix" == "release" || "$prefix" == "main" ];
+          elif  [[ "$prefix" == "release" || "$prefix" == "main" ]];
           then
               export viewer_channel="Second Life Release"
           else
-- 
cgit v1.2.3