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 From 293187e04b5dfbc002fd694b75ffdca4b2fdbc8e Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 5 Aug 2024 18:17:03 -0700 Subject: Build mac symbols for multiple binaries/dynamic libraries and upload them all to bugsplat --- .github/workflows/build.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 57faafc042..c2abc503bb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -390,15 +390,27 @@ jobs: needs: build runs-on: ubuntu-latest steps: + - name: Download Mac Symbols + if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS + uses: actions/download-artifact@v4 + with: + name: macOS-symbols + path: _artifacts + - name: Unpack Mac Symbols + run: | + mkdir _extracted + tar -xJf ${{ needs.build.outputs.viewer_channel }}.sym.tar.gz -C _extracted - name: Post Mac symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: secondlife/viewer-build-util/post-bugsplat-mac@v2 + uses: Bugsplat-Git/symbol-upload@v9.1.1 with: username: ${{ env.BUGSPLAT_USER }} password: ${{ env.BUGSPLAT_PASS }} database: "SecondLife_Viewer_2018" - channel: ${{ needs.build.outputs.viewer_channel }} + application: ${{ needs.build.outputs.viewer_channel }} version: ${{ needs.build.outputs.viewer_version }} + directory: _extracted + files: "**/*.dSYM" release: needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] -- cgit v1.2.3 From 07573f7e10a9ce4df2c2a0f6c6eb5f0935da57a6 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Mon, 5 Aug 2024 23:16:48 -0700 Subject: allow paths with spaces --- .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 c2abc503bb..cf14bac0a2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -399,7 +399,7 @@ jobs: - name: Unpack Mac Symbols run: | mkdir _extracted - tar -xJf ${{ needs.build.outputs.viewer_channel }}.sym.tar.gz -C _extracted + tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.gz" -C _extracted - name: Post Mac symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: Bugsplat-Git/symbol-upload@v9.1.1 -- cgit v1.2.3 From 83c1f45dbacecd9a9fe2a99c8dcd307b143f2b35 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 6 Aug 2024 00:26:43 -0700 Subject: Download osx artifacts to working directory --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cf14bac0a2..506dbff664 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -395,7 +395,6 @@ jobs: uses: actions/download-artifact@v4 with: name: macOS-symbols - path: _artifacts - name: Unpack Mac Symbols run: | mkdir _extracted -- cgit v1.2.3 From c52c25e10db2b86a70929793a5d723c012a37671 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 6 Aug 2024 12:06:40 -0700 Subject: As bugspat upload is broken for dylibs within .dSYM bundles, upload the dylibs directly --- .github/workflows/build.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 506dbff664..21016c1015 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -399,7 +399,7 @@ jobs: run: | mkdir _extracted tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.gz" -C _extracted - - name: Post Mac symbols + - name: Post Mac Executable symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: Bugsplat-Git/symbol-upload@v9.1.1 with: @@ -409,7 +409,18 @@ jobs: application: ${{ needs.build.outputs.viewer_channel }} version: ${{ needs.build.outputs.viewer_version }} directory: _extracted - files: "**/*.dSYM" + files: "**/*.app.dSYM" + - name: Post Mac Dylib symbols + if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS + uses: Bugsplat-Git/symbol-upload@v9.1.1 + with: + username: ${{ env.BUGSPLAT_USER }} + password: ${{ env.BUGSPLAT_PASS }} + database: "SecondLife_Viewer_2018" + application: ${{ needs.build.outputs.viewer_channel }} + version: ${{ needs.build.outputs.viewer_version }} + directory: _extracted + files: "**/*.dylib" release: needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] -- cgit v1.2.3 From fc0e70e77b44a510ad1bf2a34fa04236aa4624a2 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 6 Aug 2024 21:00:48 -0700 Subject: upload xcarchive to bugsplat --- .github/workflows/build.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 21016c1015..c88a23b85e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -395,10 +395,6 @@ jobs: uses: actions/download-artifact@v4 with: name: macOS-symbols - - name: Unpack Mac Symbols - run: | - mkdir _extracted - tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.gz" -C _extracted - name: Post Mac Executable symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: Bugsplat-Git/symbol-upload@v9.1.1 @@ -408,8 +404,8 @@ jobs: database: "SecondLife_Viewer_2018" application: ${{ needs.build.outputs.viewer_channel }} version: ${{ needs.build.outputs.viewer_version }} - directory: _extracted - files: "**/*.app.dSYM" + directory: . + files: "**/*.xcarchive.zip" - name: Post Mac Dylib symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: Bugsplat-Git/symbol-upload@v9.1.1 -- cgit v1.2.3 From 753cf01ef0165e840d90fe9e9b943eb27c2b6f19 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Tue, 6 Aug 2024 22:24:38 -0700 Subject: don't need to post dylib as we're using xcarchive --- .github/workflows/build.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c88a23b85e..03dcad2158 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -395,7 +395,7 @@ jobs: uses: actions/download-artifact@v4 with: name: macOS-symbols - - name: Post Mac Executable symbols + - name: Post Mac symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: Bugsplat-Git/symbol-upload@v9.1.1 with: @@ -406,17 +406,6 @@ jobs: version: ${{ needs.build.outputs.viewer_version }} directory: . files: "**/*.xcarchive.zip" - - name: Post Mac Dylib symbols - if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: Bugsplat-Git/symbol-upload@v9.1.1 - with: - username: ${{ env.BUGSPLAT_USER }} - password: ${{ env.BUGSPLAT_PASS }} - database: "SecondLife_Viewer_2018" - application: ${{ needs.build.outputs.viewer_channel }} - version: ${{ needs.build.outputs.viewer_version }} - directory: _extracted - files: "**/*.dylib" release: needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] -- cgit v1.2.3 From 399eb2104ec84272fb253c6029517f9f4935e17e Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 23 Jul 2024 11:22:09 +0300 Subject: viewer#2043 bugsplat symbol upload update --- .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 aa504f51d8..68fdc3c2bf 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -395,7 +395,7 @@ jobs: password: ${{ env.BUGSPLAT_PASS }} database: "SecondLife_Viewer_2018" channel: ${{ needs.build.outputs.viewer_channel }} - version: ${{ needs.build.outputs.viewer_version }} + version: ${{ needs.build.outputs.viewer_version }} (${{ needs.build.outputs.viewer_version }}) release: needs: [setvar, build, sign-and-package-windows, sign-and-package-mac] -- cgit v1.2.3 From 63a4ad9b98a21b86986385398f7a93043c4f3650 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 7 Aug 2024 14:16:11 -0700 Subject: Add Windows multi-pdb upload capability --- .github/workflows/build.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 03dcad2158..6e5d166847 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -373,15 +373,28 @@ jobs: needs: build runs-on: ubuntu-latest steps: + - name: Download Windows Symbols + if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS + uses: actions/download-artifact@v4 + with: + name: Windows-symbols + - name: Extract viewer pdb + if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS + shell: bash + run: | + mkdir _artifacts + tar -xJf ${{ needs.build.outputs.viewer_channel }}.sym.tar.xz -C _artifacts - name: Post Windows symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: secondlife/viewer-build-util/post-bugsplat-windows@v2 + uses: Bugsplat-Git/symbol-upload@v9.1.1 with: username: ${{ env.BUGSPLAT_USER }} password: ${{ env.BUGSPLAT_PASS }} database: "SecondLife_Viewer_2018" - channel: ${{ needs.build.outputs.viewer_channel }} + application: ${{ needs.build.outputs.viewer_channel }} version: ${{ needs.build.outputs.viewer_version }} + directory: _artifacts + files: "**/*.pdb" post-mac-symbols: env: -- cgit v1.2.3 From f6f3d7e0480c9c695abf6c48f553ad0e01121e78 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 7 Aug 2024 14:24:00 -0700 Subject: spacing issue --- .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 6e5d166847..2a174e5d2c 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -382,7 +382,7 @@ jobs: if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS shell: bash run: | - mkdir _artifacts + mkdir _artifacts tar -xJf ${{ needs.build.outputs.viewer_channel }}.sym.tar.xz -C _artifacts - name: Post Windows symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS -- cgit v1.2.3 From 530bc2975315240f6f5dda753b48790364a6312b Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 7 Aug 2024 16:33:00 -0700 Subject: build debug symbols for llwebrtc even for release --- .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 2a174e5d2c..ecd3f22a35 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -383,7 +383,7 @@ jobs: shell: bash run: | mkdir _artifacts - tar -xJf ${{ needs.build.outputs.viewer_channel }}.sym.tar.xz -C _artifacts + tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts - name: Post Windows symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: Bugsplat-Git/symbol-upload@v9.1.1 -- cgit v1.2.3 From 60003cf077866401a809905474d3369c7795109a Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 7 Aug 2024 19:09:19 -0700 Subject: include viewer exe in uploaded symbols --- .github/workflows/build.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ecd3f22a35..72cdf01634 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -373,6 +373,11 @@ jobs: needs: build runs-on: ubuntu-latest steps: + - name: Download viewer exe + uses: actions/download-artifact@v4 + with: + name: Windows-app + path: _artifacts - name: Download Windows Symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS uses: actions/download-artifact@v4 @@ -382,7 +387,6 @@ jobs: if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS shell: bash run: | - mkdir _artifacts tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts - name: Post Windows symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS @@ -394,7 +398,7 @@ jobs: application: ${{ needs.build.outputs.viewer_channel }} version: ${{ needs.build.outputs.viewer_version }} directory: _artifacts - files: "**/*.pdb" + files: "**/{SecondLifeViewer.exe,*.pdb}" post-mac-symbols: env: -- cgit v1.2.3 From 83390094f10e0f7069676bf2bd09bd1401ca891c Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Wed, 7 Aug 2024 20:57:05 -0700 Subject: test llwebrtc.dll for additional symbols --- .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 72cdf01634..d3a3c2ed6e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -398,7 +398,7 @@ jobs: application: ${{ needs.build.outputs.viewer_channel }} version: ${{ needs.build.outputs.viewer_version }} directory: _artifacts - files: "**/{SecondLifeViewer.exe,*.pdb}" + files: "**/{SecondLifeViewer.exe,llwebrtc.dll,*.pdb}" post-mac-symbols: env: -- cgit v1.2.3 From f1f3aa42e8fcb3e1a511c08a23c50aaf291199dc Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Thu, 8 Aug 2024 09:34:48 -0700 Subject: CR fixes --- .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 72cdf01634..c998f42905 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -390,7 +390,7 @@ jobs: tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts - name: Post Windows symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: Bugsplat-Git/symbol-upload@v9.1.1 + uses: Bugsplat-Git/symbol-upload@v10 with: username: ${{ env.BUGSPLAT_USER }} password: ${{ env.BUGSPLAT_PASS }} -- cgit v1.2.3 From d46c444aee3fa1b3623d8d94151af1bfdae815b1 Mon Sep 17 00:00:00 2001 From: Roxie Linden Date: Thu, 8 Aug 2024 12:03:53 -0700 Subject: Use the secondlife-3p fork of symbol upload, which has vMAJOR tags --- .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 3295e5b401..ebbb9dea88 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -390,7 +390,7 @@ jobs: tar -xJf "${{ needs.build.outputs.viewer_channel }}.sym.tar.xz" -C _artifacts - name: Post Windows symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: Bugsplat-Git/symbol-upload@v10 + uses: secondlife-3p/symbol-upload@v10 with: username: ${{ env.BUGSPLAT_USER }} password: ${{ env.BUGSPLAT_PASS }} @@ -414,7 +414,7 @@ jobs: name: macOS-symbols - name: Post Mac symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: Bugsplat-Git/symbol-upload@v9.1.1 + uses: secondlife-3p/symbol-upload@v10 with: username: ${{ env.BUGSPLAT_USER }} password: ${{ env.BUGSPLAT_PASS }} -- cgit v1.2.3