From 9b50c50bf2fe3fab2dbb0bcd18d7c8f5b9a13a1b Mon Sep 17 00:00:00 2001 From: Bennett Goble 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.3 From c0ab8b8f0cb1fb0b02bb42b5f7b2e8709bee5415 Mon Sep 17 00:00:00 2001 From: Bennett Goble 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.3 From eff5958c11f2fcbb0449b8e011d4676a239bbe57 Mon Sep 17 00:00:00 2001 From: Alexander Gavriliuk Date: Mon, 4 Dec 2023 08:26:09 +0100 Subject: Fix formatting in autobuild.xml (indents in close tags) --- .github/release.yaml | 36 +++++++++++++-------------- autobuild.xml | 70 ++++++++++++++++++++++++++-------------------------- 2 files changed, 53 insertions(+), 53 deletions(-) (limited to '.github') diff --git a/.github/release.yaml b/.github/release.yaml index 0f4884c944..f550e52020 100644 --- a/.github/release.yaml +++ b/.github/release.yaml @@ -1,18 +1,18 @@ -changelog: - exclude: - labels: - - ignore-for-release - authors: - - dependabot - categories: - - title: Breaking Changes 🛠 - labels: - - semver-major - - breaking-change - - title: New Features 🎉 - labels: - - semver-minor - - enhancement - - title: Other Changes - labels: - - '*' +changelog: + exclude: + labels: + - ignore-for-release + authors: + - dependabot + categories: + - title: Breaking Changes 🛠 + labels: + - semver-major + - breaking-change + - title: New Features 🎉 + labels: + - semver-minor + - enhancement + - title: Other Changes + labels: + - '*' diff --git a/autobuild.xml b/autobuild.xml index 526b615f4a..05e8f9d630 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2933,7 +2933,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE - + build @@ -2953,11 +2953,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - + arguments ../indra - + name RelWithDebInfoOS @@ -2974,7 +2974,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=TRUE - + build @@ -2994,11 +2994,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE -DROOT_PROJECT_NAME:STRING=SecondLife -DINSTALL_PROPRIETARY=FALSE - + arguments ../indra - + name ReleaseOS @@ -3019,11 +3019,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + arguments ../indra - + build @@ -3036,7 +3036,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -project SecondLife.xcodeproj -parallelizeTargets - + default True @@ -3051,7 +3051,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + build @@ -3064,7 +3064,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -project SecondLife.xcodeproj -parallelizeTargets - + name RelWithDebInfoOS @@ -3077,11 +3077,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + arguments ../indra - + build @@ -3094,7 +3094,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -project SecondLife.xcodeproj -parallelizeTargets - + name Release @@ -3107,7 +3107,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Xcode - + build @@ -3120,7 +3120,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -project SecondLife.xcodeproj -parallelizeTargets - + name ReleaseOS @@ -3144,11 +3144,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + arguments ../indra - + build @@ -3169,7 +3169,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -G Ninja -DLL_TESTS=Off - + build @@ -3207,11 +3207,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} -A ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} - + arguments ..\indra - + build @@ -3221,11 +3221,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors /build RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} - + arguments SecondLife.sln - + default True @@ -3245,11 +3245,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DUSE_OPENAL:BOOL=ON - + arguments ..\indra - + build @@ -3263,11 +3263,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors /p:useenv=true /verbosity:minimal /p:VCBuildAdditionalOptions= /incremental - + arguments SecondLife.sln - + name RelWithDebInfoOS @@ -3282,11 +3282,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors ${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN} -A ${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} - + arguments ..\indra - + build @@ -3296,11 +3296,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors /build Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN} - + arguments SecondLife.sln - + name Release @@ -3319,11 +3319,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors -DINSTALL_PROPRIETARY=FALSE -DUSE_KDU=FALSE -DUSE_OPENAL:BOOL=ON - + arguments ..\indra - + build @@ -3337,11 +3337,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors /p:useenv=true /verbosity:minimal /p:VCBuildAdditionalOptions= /incremental - + arguments SecondLife.sln - + name ReleaseOS -- cgit v1.3