summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
Diffstat (limited to '.github')
-rw-r--r--.github/release.yaml36
-rw-r--r--.github/workflows/build.yaml28
2 files changed, 40 insertions, 24 deletions
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/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 70a3747b71..df49f5fa42 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -24,6 +24,8 @@ jobs:
outputs:
viewer_channel: ${{ steps.build.outputs.viewer_channel }}
viewer_version: ${{ steps.build.outputs.viewer_version }}
+ viewer_branch: ${{ steps.which-branch.outputs.branch }}
+ relnotes: ${{ steps.which-branch.outputs.relnotes }}
imagename: ${{ steps.build.outputs.imagename }}
env:
AUTOBUILD_ADDRSIZE: 64
@@ -334,7 +336,7 @@ jobs:
version: ${{ needs.build.outputs.viewer_version }}
release:
- needs: [sign-and-package-windows, sign-and-package-mac]
+ needs: [build, sign-and-package-windows, sign-and-package-mac]
runs-on: ubuntu-latest
if: github.ref_type == 'tag' && startsWith(github.ref_name, 'Second_Life_')
steps:
@@ -365,17 +367,31 @@ jobs:
mv newview/viewer_version.txt macOS-viewer_version.txt
# forked from softprops/action-gh-release
- - uses: secondlife-3p/action-gh-release@v1
+ - name: Create GitHub release
+ id: release
+ uses: secondlife-3p/action-gh-release@v1
with:
- # name the release page for the build number so we can find it
- # easily (analogous to looking up a codeticket build page)
- name: "v${{ github.run_id }}"
+ # name the release page for the branch
+ name: "${{ needs.build.outputs.viewer_branch }}"
+ # SL-20546: want the channel and version to be visible on the
+ # release page
+ body: |
+ Build ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+ ${{ needs.build.outputs.viewer_channel }}
+ ${{ needs.build.outputs.viewer_version }}
+ ${{ needs.build.outputs.relnotes }}
prerelease: true
generate_release_notes: true
- # the only reason we generate a GH release is to post build products
+ target_commitish: ${{ github.sha }}
+ previous_tag: release
+ append_body: true
fail_on_unmatched_files: true
files: |
*.dmg
*.exe
*-autobuild-package.xml
*-viewer_version.txt
+
+ - name: post release URL
+ run: |
+ echo "::notice::Release ${{ steps.release.outputs.url }}"