diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-09 15:43:06 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-09 15:43:06 -0700 |
| commit | c106221726c48a4231b7854bff224ae422c0517f (patch) | |
| tree | f0608f7f72f23a447778f8bce6f210eb221ebdf1 /.github | |
| parent | cf160e30236226fdd3343a7ba50d05265709718d (diff) | |
| parent | 3b2c32fdf940b37108e13eb69fcf0468469dc182 (diff) | |
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# .github/workflows/build.yaml
# indra/llui/llscrolllistctrl.cpp
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build.yaml | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index e54eb170af..00b9ccd2c9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -360,15 +360,32 @@ 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 + with: + name: Windows-symbols + - name: Extract viewer pdb + if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS + shell: bash + run: | + 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: secondlife-3p/symbol-upload@v10 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: "**/{SecondLifeViewer.exe,llwebrtc.dll,*.pdb}" post-mac-symbols: env: @@ -378,15 +395,22 @@ jobs: if: needs.build.outputs.configuration == 'Release' 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 - name: Post Mac symbols if: env.BUGSPLAT_USER && env.BUGSPLAT_PASS - uses: secondlife/viewer-build-util/post-bugsplat-mac@v2 + uses: secondlife-3p/symbol-upload@v10 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 }} (${{ needs.build.outputs.viewer_version }}) + directory: . + files: "**/*.xcarchive.zip" release: needs: [setup, build, sign-and-package-windows, sign-and-package-mac] |