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(-)
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