Skip to content

Commit 661fc7f

Browse files
committed
fix: properly retrieve branch name to pass to release BOM step
1 parent 7de5923 commit 661fc7f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/release-project-in-dir.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
needs: publish
5454
if: "!contains(github.event.release.tag_name, 'RC')" # not sure we should keep this the RC part
5555
steps:
56-
- uses: actions/checkout@v3
56+
- name: Checkout "${{inputs.version_branch}}" branch
57+
uses: actions/checkout@v3
5758
with:
5859
ref: "${{inputs.version_branch}}"
5960

@@ -64,10 +65,9 @@ jobs:
6465
distribution: temurin
6566
cache: 'maven'
6667

67-
- name: Change version to release version
68+
- name: Update version to new SNAPSHOT version
6869
run: |
69-
mvn ${MAVEN_ARGS} versions:set -DnewVersion="${RELEASE_VERSION:1}" versions:commit
70-
mvn ${MAVEN_ARGS} -q build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
70+
mvn ${MAVEN_ARGS} build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT versions:commit
7171
git config --local user.email "[email protected]"
7272
git config --local user.name "GitHub Action"
7373
git commit -m "Set new SNAPSHOT version into pom files." -a

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
project_dir: '.'
4848

4949
release-bom:
50-
needs: release-sdk
50+
needs: [ prepare-release, release-sdk ] # needs prepare-release to be able to get the proper version branch name
5151
uses: ./.github/workflows/release-project-in-dir.yml
5252
secrets: inherit
5353
with:

0 commit comments

Comments
 (0)