diff --git a/.github/workflows/pre-post-release.yml b/.github/workflows/pre-post-release.yml index 76cc733b..aed3f4ab 100644 --- a/.github/workflows/pre-post-release.yml +++ b/.github/workflows/pre-post-release.yml @@ -15,7 +15,7 @@ on: required: true phase: description: 'Pre or post release phase' - type: string #valid values are 'pre' or 'post' + type: string # valid values are 'pre' or 'post' required: true env: @@ -82,7 +82,7 @@ jobs: if: inputs.phase == 'post' uses: ./.github/workflows/maven-goal with: - command: ./mvnw -V versions:set -DprocessAllModules=true -DgenerateBackupPoms=false -nextSnapshot=true + command: ./mvnw -V versions:set -DprocessAllModules=true -DgenerateBackupPoms=false -DnextSnapshot=true - name: Push the ${{ inputs.phase }} release branch run: | diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 34c83109..350c8c97 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -12,6 +12,9 @@ on: description: 'The version to release (e.g. 1.2.3). This workflow will automatically perform the required version bumps' required: true +permissions: + contents: read + concurrency: group: ${{ github.workflow }} @@ -19,6 +22,8 @@ jobs: pre-release: name: "Bump versions and create PR" uses: ./.github/workflows/pre-post-release.yml + permissions: + contents: write with: ref: ${{ inputs.ref }} version: ${{ inputs.version }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07dd5be5..7026c868 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,10 +19,12 @@ on: permissions: contents: read - concurrency: group: ${{ github.workflow }} +env: + RELEASE_VERSION: ${{ inputs.version }} + jobs: validate-tag: runs-on: ubuntu-latest @@ -88,7 +90,7 @@ jobs: needs: - release uses: ./.github/workflows/pre-post-release.yml - if: inputs.dry_run == 'false' + if: inputs.dry_run == false with: ref: ${{ inputs.ref }} version: ${{ inputs.version }}