From 1f726e81e1aa8e936ac4b9634ebfd285d7779c22 Mon Sep 17 00:00:00 2001 From: EliSauder <24995216+EliSauder@users.noreply.github.com> Date: Fri, 1 Nov 2024 14:50:37 -0700 Subject: [PATCH] feat: handle any semver prerelease format --- .github/workflows/publish-base.yml | 7 ++++++- .github/workflows/publish-microzig.yml | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-base.yml b/.github/workflows/publish-base.yml index 577a6fbb7..87d3974cf 100644 --- a/.github/workflows/publish-base.yml +++ b/.github/workflows/publish-base.yml @@ -11,6 +11,11 @@ on: type: string default: "" description: The version tag to publish + is-prerelease: + required: false + type: boolean + default: false + description: Whether or not the publish is a prerelease github-artifact-name: required: true type: string @@ -103,4 +108,4 @@ jobs: draft: true generateReleaseNotes: true tag: ${{ inputs.tag }} - prerelease: ${{ contains(inputs.tag, '-beta') || contains(inputs.tag, '-alpha') || contains(inputs.tag, '-rc') }} + prerelease: ${{ inputs.is-prerelease }} diff --git a/.github/workflows/publish-microzig.yml b/.github/workflows/publish-microzig.yml index 46e2155ab..c530d6c34 100644 --- a/.github/workflows/publish-microzig.yml +++ b/.github/workflows/publish-microzig.yml @@ -29,7 +29,7 @@ jobs: # Publish microzig publish-microzig: uses: ./.github/workflows/publish-base.yml - needs: alter-microzig-artifact + needs: build-microzig concurrency: group: publish cancel-in-progress: false @@ -37,6 +37,7 @@ jobs: tag: ${{ github.ref_name }} github-artifact-name: microzig-build source-path: / + is-prerelease: ${{ needs.build-microzig.outputs.prerelease != "" }} secrets: target-path: ${{ secrets.DEPLOY_ROOT_DATA_PATH }} ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }}