diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2ebea18..43dfab3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Perform Release +name: Release on: workflow_dispatch: diff --git a/.github/workflows/spring-artifactory-release.yml b/.github/workflows/spring-artifactory-release.yml index d1a6791..a1628f5 100644 --- a/.github/workflows/spring-artifactory-release.yml +++ b/.github/workflows/spring-artifactory-release.yml @@ -1,4 +1,4 @@ -name: Perform Release +name: Perform Release with Artifactory on: workflow_call: @@ -14,9 +14,6 @@ on: run-name: Release version ${{ inputs.releaseVersion }} -env: - IS_GA: ${{ (contains(inputs.releaseVersion, '-M') || contains(inputs.releaseVersion, '-RC')) && false || true }} - jobs: staging: uses: ./.github/workflows/stage-release.yml @@ -32,7 +29,7 @@ jobs: secrets: inherit promote_milestone: - if: ${{ !env.IS_GA }} + if: ${{ contains(inputs.releaseVersion, '-M') || contains(inputs.releaseVersion, '-RC') }} needs: verify-staged uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-promote-milestone.yml@main with: @@ -41,7 +38,7 @@ jobs: secrets: inherit promote_ga: - if: ${{ env.IS_GA }} + if: ${{ ! contains(inputs.releaseVersion, '-') }} needs: verify-staged uses: spring-projects/spring-integration-aws/.github/workflows/spring-artifactory-promote-central.yml@main with: