From e165be000781034c0d56659f3f021b1efb323108 Mon Sep 17 00:00:00 2001
From: Brad Linden <brad@lindenlab.com>
Date: Tue, 18 Jun 2024 14:23:43 -0700
Subject: Attempt to use provided GITHUB_TOKEN and generate tag id from inputs

---
 .github/workflows/tag-release.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to '.github/workflows/tag-release.yaml')

diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml
index cb9babaea8..24d8fbb8bf 100644
--- a/.github/workflows/tag-release.yaml
+++ b/.github/workflows/tag-release.yaml
@@ -26,23 +26,22 @@ on:
 jobs:
   tag-release:
     runs-on: ubuntu-latest
-    env:
-      LL_TAG_RELEASE_TOKEN: ${{ secrets.LL_TAG_RELEASE_TOKEN }}
     steps:
       - name: Setup Env Vars
         run: |
           CHANNEL="${{ inputs.channel }}"
           echo VIEWER_CHANNEL="Second_Life_${CHANNEL:-Develop}" >> ${GITHUB_ENV}
-          echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV}
+          NIGHTLY_DATE=$(date --rfc-3339=date)
+          echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV}
+          echo TAG_ID="${{ github.sha }}-${{ inputs.project || '${NIGHTLY_DATE}' }}"
       - name: Update Tag
         uses: actions/github-script@v7.0.1
-        if: env.LL_TAG_RELEASE_TOKEN
         with:
-          github-token: ${{ env.LL_TAG_RELEASE_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             github.rest.git.createRef(
               owner: context.repo.owner,
               repo: context.repo.repo,
-              ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.NIGHTLY_DATE }}",
+              ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.TAG_ID }}",
               sha: context.sha
               )
-- 
cgit v1.2.3