diff --git a/.github/workflows/CREATE_RELEASE_BRANCH.yml b/.github/workflows/CREATE_RELEASE_BRANCH.yml index 4b95f9b5a9..57a1142ee1 100644 --- a/.github/workflows/CREATE_RELEASE_BRANCH.yml +++ b/.github/workflows/CREATE_RELEASE_BRANCH.yml @@ -33,27 +33,12 @@ jobs: distribution: 'temurin' java-version: '17' - - name: Configure git user - run: | - # https://github.com/actions/checkout/issues/13#issuecomment-724415212 - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - - - name: Create branch - id: create-branch - run: | - MINOR_VERSION=${RELEASE_VERSION%.*} - git checkout -b release/${MINOR_VERSION} - git push --set-upstream origin release/${MINOR_VERSION} - echo "branchName=release/${RELEASE_VERSION%.*}" >> $GITHUB_OUTPUT - env: - RELEASE_VERSION: ${{ github.event.inputs.version }} - - name: Set snapshot version on release branch + id: set-snapshot-version run: | MINOR_VERSION=${RELEASE_VERSION%.*} - git checkout release/${MINOR_VERSION} mvn -B versions:set -DnewVersion=${RELEASE_VERSION}-SNAPSHOT -DgenerateBackupPoms=false -f parent + echo "branchName=release/${RELEASE_VERSION%.*}" >> $GITHUB_OUTPUT env: RELEASE_VERSION: ${{ github.event.inputs.version }} @@ -61,7 +46,7 @@ jobs: uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ steps.create-branch.outputs.branchName }} + branch: ${{ steps.set-snapshot-version.outputs.branchName }} commit-message: "ci: set next snapshot version" committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> base: main