From f5659945b5a177b325f98b6d598af47a214e7abc Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 17 Jun 2024 18:54:45 -0700 Subject: Fix secret name since GITHUB_ prefix is reserved --- .github/workflows/tag-release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index b73ec502f1..2083b414f5 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -27,7 +27,7 @@ jobs: tag-release: runs-on: ubuntu-latest env: - GITHUB_TAG_TOKEN: ${{ secrets.GITHUB_TAG_TOKEN }} + LL_TAG_RELEASE_TOKEN: ${{ secrets.LL_TAG_RELEASE_TOKEN }} steps: - name: Setup Env Vars run: | @@ -36,9 +36,9 @@ jobs: echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} - name: Update Tag uses: actions/github-script@v7.0.1 - if: env.GITHUB_TAG_TOKEN + if: env.LL_TAG_RELEASE_TOKEN with: - github-token: ${{ env.GITHUB_TAG_TOKEN }} + github-token: ${{ env.LL_TAG_RELEASE_TOKEN }} script: | github.rest.git.createRef( owner: context.repo.owner, -- cgit v1.2.3 From 05efb1494ddf2b3e68bc98835dc353f01482c25e Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 17 Jun 2024 18:57:26 -0700 Subject: Fix yaml indentation of javascript snippet in tag-release workflow --- .github/workflows/tag-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index 2083b414f5..cb9babaea8 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -45,4 +45,4 @@ jobs: repo: context.repo.repo, ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.NIGHTLY_DATE }}", sha: context.sha - ) + ) -- cgit v1.2.3 From e165be000781034c0d56659f3f021b1efb323108 Mon Sep 17 00:00:00 2001 From: Brad Linden 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(-) 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 From aa6161ca94d5bd8640840f981ca8b243b553acaa Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Tue, 18 Jun 2024 14:35:22 -0700 Subject: Shorten SHA value used in tag id and attempt to fix js/yaml syntax error --- .github/workflows/tag-release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index 24d8fbb8bf..18fe686d36 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -33,15 +33,15 @@ jobs: echo VIEWER_CHANNEL="Second_Life_${CHANNEL:-Develop}" >> ${GITHUB_ENV} NIGHTLY_DATE=$(date --rfc-3339=date) echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV} - echo TAG_ID="${{ github.sha }}-${{ inputs.project || '${NIGHTLY_DATE}' }}" + echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" - name: Update Tag uses: actions/github-script@v7.0.1 with: github-token: ${{ secrets.GITHUB_TOKEN }} script: | - github.rest.git.createRef( + github.rest.git.createRef({ owner: context.repo.owner, repo: context.repo.repo, ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.TAG_ID }}", sha: context.sha - ) + }) -- cgit v1.2.3 From 32b912af9a821b0edaebb75d037da05df6ff25e5 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Thu, 20 Jun 2024 17:15:16 -0700 Subject: Make sure TAG_ID actually gets added to GITHUB_ENV --- .github/workflows/tag-release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index 18fe686d36..65d1d43a83 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -33,7 +33,7 @@ jobs: echo VIEWER_CHANNEL="Second_Life_${CHANNEL:-Develop}" >> ${GITHUB_ENV} NIGHTLY_DATE=$(date --rfc-3339=date) echo NIGHTLY_DATE=${NIGHTLY_DATE} >> ${GITHUB_ENV} - echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" + echo TAG_ID="$(echo ${{ github.sha }} | cut -c1-8)-${{ inputs.project || '${NIGHTLY_DATE}' }}" >> ${GITHUB_ENV} - name: Update Tag uses: actions/github-script@v7.0.1 with: -- cgit v1.2.3