From 28002636a2ffb1f4c89785e84d5f72c20a0e32d5 Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:23:40 -0500 Subject: [PATCH 1/2] chore: upload zpm.xml artifact as well Fixes #718 --- .github/workflows/main.yml | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bfb5dd80..1173a026 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -272,7 +272,7 @@ jobs: tag_name: v${{ needs.prepare.outputs.version }} release_name: v${{ needs.prepare.outputs.version }} prerelease: ${{ github.event_name != 'release' }} - - name: Upload Beta Release Asset + - name: Upload Beta Release Asset (versioned) uses: actions/upload-release-asset@v1 if: github.event_name == 'push' env: @@ -282,6 +282,16 @@ jobs: asset_path: zpm-${{ needs.prepare.outputs.version }}.xml asset_name: zpm-${{ needs.prepare.outputs.version }}.xml asset_content_type: text/xml + - name: Upload Beta Release Asset (versionless) + uses: actions/upload-release-asset@v1 + if: github.event_name == 'push' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: zpm-${{ needs.prepare.outputs.version }}.xml + asset_name: zpm.xml + asset_content_type: text/xml - name: Publish release if: github.event_name == 'release' env: @@ -299,7 +309,7 @@ jobs: halt EOF docker stop $CONTAINER - - name: Upload Public Release Asset + - name: Upload Public Release Asset (versioned) uses: actions/upload-release-asset@v1 if: github.event_name == 'release' env: @@ -309,6 +319,16 @@ jobs: asset_path: zpm-${{ needs.prepare.outputs.version }}.xml asset_name: zpm-${{ needs.prepare.outputs.version }}.xml asset_content_type: text/xml + - name: Upload Public Release Asset (versionless) + uses: actions/upload-release-asset@v1 + if: github.event_name == 'release' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ github.event.release.upload_url }} + asset_path: zpm-${{ needs.prepare.outputs.version }}.xml + asset_name: zpm.xml + asset_content_type: text/xml - name: Bump Release number if: github.event_name == 'release' env: From 6e28594b1f3c0f3dbdf0c7de096e40661d60e39f Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Fri, 7 Feb 2025 10:26:44 -0500 Subject: [PATCH 2/2] docs: add CHANGELOG entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6d0eccf..fe1d74e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - #669: Work with a wider variety of ORAS repos (removes _catalog call) - #726: Fixed a bug where loading a tarball doesn't install dependencies from `.modules` subfolder even when it's available - #731: Issue upgrading from v0.9.x due to refactor of repo classes +- #718: Upload zpm.xml (without the version) as an artifact to provide a more stable URL to latest release artifact on GitHub ### Security -