From a0b3021bdcf76859054fda8e30abb3ed47749e83 Mon Sep 17 00:00:00 2001 From: Bennett Goble Date: Wed, 29 May 2024 08:10:00 -0700 Subject: Trim trailing whitespace Start trimming trailing whitespace, but limit the blast radius to a handful of file types. --- .github/labeler.yaml | 2 +- .github/workflows/build.yaml | 4 ++-- .github/workflows/stale.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to '.github') diff --git a/.github/labeler.yaml b/.github/labeler.yaml index d31a361baf..a334536389 100644 --- a/.github/labeler.yaml +++ b/.github/labeler.yaml @@ -1,6 +1,6 @@ llappearance: - indra/llappearance/**/* - + llaudio: - indra/llaudio/**/* diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8d1c6b63e6..64b938747c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -412,7 +412,7 @@ jobs: - uses: actions/download-artifact@v4 with: pattern: "*-metadata" - + - name: Rename metadata run: | cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml @@ -441,7 +441,7 @@ jobs: append_body: true fail_on_unmatched_files: true files: | - macOS-installer/*.dmg + macOS-installer/*.dmg Windows-installer/*.exe *-autobuild-package.xml *-viewer_version.txt diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml index e44e223589..f77151a815 100644 --- a/.github/workflows/stale.yaml +++ b/.github/workflows/stale.yaml @@ -1,4 +1,4 @@ -name: Stale PRs +name: Stale PRs on: workflow_dispatch: schedule: -- cgit v1.2.3 From 41cb778fb0a2918816965ccc0ece5d0080d5180a Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Thu, 13 Jun 2024 17:37:03 -0700 Subject: Initial work setting up scheduled releases for develop branch. --- .github/workflows/tag-nightly.yaml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/tag-nightly.yaml (limited to '.github') diff --git a/.github/workflows/tag-nightly.yaml b/.github/workflows/tag-nightly.yaml new file mode 100644 index 0000000000..8193d68f2f --- /dev/null +++ b/.github/workflows/tag-nightly.yaml @@ -0,0 +1,27 @@ +name: Tag Nightly Builds + +on: + # schedule event triggers always run on the default branch + # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule + schedule: + - cron: "21 2 * * 2,4,6" # 2:21am UTC tues/thurs/sat == 7:21pm PDT mon/wed/fri -- see https://crontab.guru/#21_01_*_*_2,4,6 + workflow_dispatch: + +jobs: + tag-develop-nightly: + runs-on: ubuntu-latest + steps: + - name: Setup Date Env + run: | + echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} + - name: Update Tag + uses: actions/github-script@v7.0.1 + with: + github-token: ${{ secrets.GITHUB_NIGHTLY_TOKEN }} + script: | + github.rest.git.createRef( + owner: context.repo.owner, + repo: context.repo.repo, + ref: "refs/tags/Second_Life_Develop#${{ env.NIGHTLY_DATE }}", + sha: context.sha + ) -- cgit v1.2.3 From b9f287815a39c69f3db5212f06a295d1e5dbb6da Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Thu, 13 Jun 2024 17:52:34 -0700 Subject: Add new viewer_channel detection for develop branch --- .github/workflows/build.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 57faafc042..f9b0bdc309 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -231,6 +231,9 @@ jobs: elif [[ "$prefix" == "release" || "$prefix" == "main" ]]; then export viewer_channel="Second Life Release" + elif [[ "$branch" == "develop" ]]; + then + export viewer_channel="Second Life Develop" else export viewer_channel="Second Life Test" fi -- cgit v1.2.3 From 0e1e1685d4b94d32d32641f4d241dea3a7d0980d Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Thu, 13 Jun 2024 18:14:21 -0700 Subject: Skip the actual tag update step gracefully until we have proper tokens set up --- .github/workflows/tag-nightly.yaml | 1 + 1 file changed, 1 insertion(+) (limited to '.github') diff --git a/.github/workflows/tag-nightly.yaml b/.github/workflows/tag-nightly.yaml index 8193d68f2f..bb9e7094ec 100644 --- a/.github/workflows/tag-nightly.yaml +++ b/.github/workflows/tag-nightly.yaml @@ -16,6 +16,7 @@ jobs: echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} - name: Update Tag uses: actions/github-script@v7.0.1 + if: ${{ secrets.GITHUB_NIGHTLY_TOKEN != "" }} with: github-token: ${{ secrets.GITHUB_NIGHTLY_TOKEN }} script: | -- cgit v1.2.3 From 84a221e7dd408bf123be2adaa9c4e33ba4509a0d Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 17 Jun 2024 17:41:53 -0700 Subject: Renamed tag-nightly.yaml to generalize it to other tags when using workflow_dispatch --- .github/workflows/tag-nightly.yaml | 28 ---------------------------- .github/workflows/tag-release.yaml | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/tag-nightly.yaml create mode 100644 .github/workflows/tag-release.yaml (limited to '.github') diff --git a/.github/workflows/tag-nightly.yaml b/.github/workflows/tag-nightly.yaml deleted file mode 100644 index bb9e7094ec..0000000000 --- a/.github/workflows/tag-nightly.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Tag Nightly Builds - -on: - # schedule event triggers always run on the default branch - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule - schedule: - - cron: "21 2 * * 2,4,6" # 2:21am UTC tues/thurs/sat == 7:21pm PDT mon/wed/fri -- see https://crontab.guru/#21_01_*_*_2,4,6 - workflow_dispatch: - -jobs: - tag-develop-nightly: - runs-on: ubuntu-latest - steps: - - name: Setup Date Env - run: | - echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} - - name: Update Tag - uses: actions/github-script@v7.0.1 - if: ${{ secrets.GITHUB_NIGHTLY_TOKEN != "" }} - with: - github-token: ${{ secrets.GITHUB_NIGHTLY_TOKEN }} - script: | - github.rest.git.createRef( - owner: context.repo.owner, - repo: context.repo.repo, - ref: "refs/tags/Second_Life_Develop#${{ env.NIGHTLY_DATE }}", - sha: context.sha - ) diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml new file mode 100644 index 0000000000..bb9e7094ec --- /dev/null +++ b/.github/workflows/tag-release.yaml @@ -0,0 +1,28 @@ +name: Tag Nightly Builds + +on: + # schedule event triggers always run on the default branch + # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule + schedule: + - cron: "21 2 * * 2,4,6" # 2:21am UTC tues/thurs/sat == 7:21pm PDT mon/wed/fri -- see https://crontab.guru/#21_01_*_*_2,4,6 + workflow_dispatch: + +jobs: + tag-develop-nightly: + runs-on: ubuntu-latest + steps: + - name: Setup Date Env + run: | + echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} + - name: Update Tag + uses: actions/github-script@v7.0.1 + if: ${{ secrets.GITHUB_NIGHTLY_TOKEN != "" }} + with: + github-token: ${{ secrets.GITHUB_NIGHTLY_TOKEN }} + script: | + github.rest.git.createRef( + owner: context.repo.owner, + repo: context.repo.repo, + ref: "refs/tags/Second_Life_Develop#${{ env.NIGHTLY_DATE }}", + sha: context.sha + ) -- cgit v1.2.3 From b9a8b3b240512bdf5bbb99f6bc581872fead86b8 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 17 Jun 2024 17:42:30 -0700 Subject: Update naming and add options to tag-release workflow_dispatch. --- .github/workflows/tag-release.yaml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index bb9e7094ec..8bb498219d 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -1,14 +1,30 @@ -name: Tag Nightly Builds +name: Tag a Build on: # schedule event triggers always run on the default branch # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule schedule: + # run "nightly" builds on default branch every mon/wed/fri - cron: "21 2 * * 2,4,6" # 2:21am UTC tues/thurs/sat == 7:21pm PDT mon/wed/fri -- see https://crontab.guru/#21_01_*_*_2,4,6 workflow_dispatch: + inputs: + - channel: + description: "Channel to configure the build" + required: true + type: choice + default: "Test" + options: + - "Test" + - "Develop" + - "Project" + - "Release" + - project: + description: "Project Name (used for channel name in project builds, and tag name for all builds)" + default: "hippo" + # TODO - add an input for selecting another sha to build other than head of branch jobs: - tag-develop-nightly: + tag-release: runs-on: ubuntu-latest steps: - name: Setup Date Env -- cgit v1.2.3 From dd64c39d64ef0b829952dac5c4ef61c51671b9d4 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 17 Jun 2024 17:55:29 -0700 Subject: Pass through input channel to select the tag channel name --- .github/workflows/build.yaml | 6 ------ .github/workflows/tag-release.yaml | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f9b0bdc309..aa504f51d8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,12 +1,6 @@ name: Build on: - workflow_dispatch: - inputs: - release_run: - type: boolean - description: Do a release of this build - default: false pull_request: push: branches: ["main", "release/*", "project/*"] diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index 8bb498219d..2a375e0375 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -27,8 +27,10 @@ jobs: tag-release: runs-on: ubuntu-latest steps: - - name: Setup Date Env + - 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} - name: Update Tag uses: actions/github-script@v7.0.1 @@ -39,6 +41,6 @@ jobs: github.rest.git.createRef( owner: context.repo.owner, repo: context.repo.repo, - ref: "refs/tags/Second_Life_Develop#${{ env.NIGHTLY_DATE }}", + ref: "refs/tags/${{ env.VIEWER_CHANNEL }}#${{ env.NIGHTLY_DATE }}", sha: context.sha ) -- cgit v1.2.3 From 352dff68307ba52ed124aea532e9a49048d8046a Mon Sep 17 00:00:00 2001 From: Brad Linden <46733234+brad-linden@users.noreply.github.com> Date: Mon, 17 Jun 2024 18:32:24 -0700 Subject: Attempt to fix workflow syntax in new tag-release workflow (#1792) --- .github/workflows/tag-release.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index 2a375e0375..c803d4c6d0 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -8,17 +8,17 @@ on: - cron: "21 2 * * 2,4,6" # 2:21am UTC tues/thurs/sat == 7:21pm PDT mon/wed/fri -- see https://crontab.guru/#21_01_*_*_2,4,6 workflow_dispatch: inputs: - - channel: + channel: description: "Channel to configure the build" required: true type: choice default: "Test" options: - - "Test" - - "Develop" - - "Project" - - "Release" - - project: + - "Test" + - "Develop" + - "Project" + - "Release" + project: description: "Project Name (used for channel name in project builds, and tag name for all builds)" default: "hippo" # TODO - add an input for selecting another sha to build other than head of branch -- cgit v1.2.3 From 3da16d1899324b358ac0d27ddd99bf8214f6fb54 Mon Sep 17 00:00:00 2001 From: Brad Linden Date: Mon, 17 Jun 2024 18:38:00 -0700 Subject: Attempt to fix tag-release workflow by moving conditional secrets usage into env --- .github/workflows/tag-release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/tag-release.yaml b/.github/workflows/tag-release.yaml index c803d4c6d0..b73ec502f1 100644 --- a/.github/workflows/tag-release.yaml +++ b/.github/workflows/tag-release.yaml @@ -26,6 +26,8 @@ on: jobs: tag-release: runs-on: ubuntu-latest + env: + GITHUB_TAG_TOKEN: ${{ secrets.GITHUB_TAG_TOKEN }} steps: - name: Setup Env Vars run: | @@ -34,9 +36,9 @@ jobs: echo NIGHTLY_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV} - name: Update Tag uses: actions/github-script@v7.0.1 - if: ${{ secrets.GITHUB_NIGHTLY_TOKEN != "" }} + if: env.GITHUB_TAG_TOKEN with: - github-token: ${{ secrets.GITHUB_NIGHTLY_TOKEN }} + github-token: ${{ env.GITHUB_TAG_TOKEN }} script: | github.rest.git.createRef( owner: context.repo.owner, -- cgit v1.2.3