Skip to content

Commit 422c93f

Browse files
committed
Fix release pipeline to checkout before performing release
Signed-off-by: Ricardo Zanini <[email protected]>
1 parent 34616a8 commit 422c93f

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.github/workflows/release.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,14 @@ jobs:
4646
4747
- name: Maven release ${{steps.metadata.outputs.current-version}}
4848
run: |
49+
git checkout -b release
4950
mvn -B release:prepare -Prelease -DreleaseVersion=${{steps.metadata.outputs.current-version}} -DdevelopmentVersion=${{steps.metadata.outputs.next-version}}
51+
git checkout ${{github.base_ref}}
52+
git rebase release
5053
mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
5154
env:
5255
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5356
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
5457

55-
- name: Push changes to ${{github.base_ref}} branch
56-
run: |
57-
git push
58-
git push origin ${{steps.metadata.outputs.current-version}}
58+
- name: Push tags
59+
run: git push && git push --tags

pom.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<version.jdk>${java.version}</version.jdk>
6767
<version.jsonschema2pojo-maven-plugin>1.0.1</version.jsonschema2pojo-maven-plugin>
6868
<version.javadoc.plugin>3.6.0</version.javadoc.plugin>
69-
<version.release.plugin>2.3.2</version.release.plugin>
69+
<version.release.plugin>2.5.3</version.release.plugin>
7070
<version.source.plugin>3.3.0</version.source.plugin>
7171
<version.surefire.plugin>2.22.0</version.surefire.plugin>
7272

@@ -277,6 +277,9 @@
277277
<groupId>org.apache.maven.plugins</groupId>
278278
<artifactId>maven-gpg-plugin</artifactId>
279279
<version>${version.gpg.plugin}</version>
280+
<configuration>
281+
<skip>true</skip>
282+
</configuration>
280283
</plugin>
281284
<plugin>
282285
<artifactId>maven-deploy-plugin</artifactId>

0 commit comments

Comments
 (0)