From 9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Sun, 19 Nov 2023 19:35:40 -0800
Subject: Only download release artifacts for release

Only download and publish installers on public releases. This simplifies
the release process, as the flatten_files utility from
viewer-build-utils is not necessary this way. More importantly, it
doesn't clutter public releases with files that shouldn't be published
such as debug symbols.
---
 .github/workflows/build.yaml | 48 ++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1cd0c2526f..d1737eeda4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -330,29 +330,29 @@ jobs:
     steps:
       - uses: actions/download-artifact@v3
         with:
-          path: artifacts
+          name: Windows-installer
 
-      - name: Reshuffle artifact files
-        uses: secondlife/viewer-build-util/release-artifacts@main
+      - uses: actions/download-artifact@v3
+        with:
+          name: macOS-installer
+
+      - uses: actions/download-artifact@v3
         with:
-          input-path: artifacts
-          output-path: assets
-          # The *-app artifacts are for use only by the signing and
-          # packaging steps. Once we've generated signed installers, we no
-          # longer need them, and we CERTAINLY don't want to publish
-          # thousands of individual files as separate URLs.
-          exclude: |-
-            Windows-app
-            macOS-app
-          # Use just "Windows" or "macOS" prefix because these are the only
-          # artifacts in which we expect files from both platforms with
-          # colliding names (e.g. autobuild-package.xml). release-artifacts
-          # normally resolves collisions by prepending the artifact name, so
-          # when we anticipate collisions, it's good to keep the prefix
-          # short and sweet.
-          prefix: |-
-            Windows-metadata=Windows
-            macOS-metadata=macOS
+          name: Windows-metadata
+
+      - name: Rename windows metadata 
+        run: |
+          mv autobuild-package.xml Windows-autobuild-package.xml
+          mv newview/viewer_version.txt Windows-viewer_version.txt
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: macOS-metadata
+
+      - name: Rename macOS metadata 
+        run: |
+          mv autobuild-package.xml macOS-autobuild-package.xml
+          mv newview/viewer_version.txt macOS-viewer_version.txt
 
       # forked from softprops/action-gh-release
       - uses: secondlife-3p/action-gh-release@v1
@@ -364,4 +364,8 @@ jobs:
           generate_release_notes: true
           # the only reason we generate a GH release is to post build products
           fail_on_unmatched_files: true
-          files: "assets/*"
+          files: |
+            *.dmg 
+            *.exe
+            *-autobuild-package.xml
+            *-viewer_version.txt
-- 
cgit v1.2.3


From c0ab8b8f0cb1fb0b02bb42b5f7b2e8709bee5415 Mon Sep 17 00:00:00 2001
From: Bennett Goble <signal@lindenlab.com>
Date: Mon, 20 Nov 2023 16:23:05 -0800
Subject: Switch to viewer-build-util@v1

Switch the build workflow from targeting the `main` branch of
viewer-build-util (which may receive breaking changes) to the stable
`v1` major version tag.
---
 .github/workflows/build.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 1cd0c2526f..d8b9b5e8e0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -254,7 +254,7 @@ jobs:
     runs-on: windows
     steps:
       - name: Sign and package Windows viewer
-        uses: secondlife/viewer-build-util/sign-pkg-windows@main
+        uses: secondlife/viewer-build-util/sign-pkg-windows@v1
         with:
           vault_uri: "${{ secrets.AZURE_KEY_VAULT_URI }}"
           cert_name: "${{ secrets.AZURE_CERT_NAME }}"
@@ -286,7 +286,7 @@ jobs:
           [[ -n "$USERNAME" && -n "$PASSWORD" && -n "$TEAM_ID" ]]
 
       - name: Sign and package Mac viewer
-        uses: secondlife/viewer-build-util/sign-pkg-mac@main
+        uses: secondlife/viewer-build-util/sign-pkg-mac@v1
         with:
           channel: ${{ needs.build.outputs.viewer_channel }}
           imagename: ${{ needs.build.outputs.imagename }}
@@ -302,7 +302,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Post Windows symbols
-        uses: secondlife/viewer-build-util/post-bugsplat-windows@main
+        uses: secondlife/viewer-build-util/post-bugsplat-windows@v1
         with:
           username: ${{ secrets.BUGSPLAT_USER }}
           password: ${{ secrets.BUGSPLAT_PASS }}
@@ -315,7 +315,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Post Mac symbols
-        uses: secondlife/viewer-build-util/post-bugsplat-mac@main
+        uses: secondlife/viewer-build-util/post-bugsplat-mac@v1
         with:
           username: ${{ secrets.BUGSPLAT_USER }}
           password: ${{ secrets.BUGSPLAT_PASS }}
@@ -333,7 +333,7 @@ jobs:
           path: artifacts
 
       - name: Reshuffle artifact files
-        uses: secondlife/viewer-build-util/release-artifacts@main
+        uses: secondlife/viewer-build-util/release-artifacts@v1
         with:
           input-path: artifacts
           output-path: assets
-- 
cgit v1.2.3