Skip to content

Commit 12bc4fa

Browse files
Merge pull request #295 from ricardozanini/fix-release-gha
Fix release pipeline to checkout before performing release
2 parents 34616a8 + 566f157 commit 12bc4fa

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/release.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,15 @@ 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+
cat release.properties
52+
git checkout ${{github.base_ref}}
53+
git rebase release
5054
mvn -B release:perform -Darguments=-DperformRelease -DperformRelease -Prelease
5155
env:
5256
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
5357
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
5458

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

pom.xml

+2-2
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>3.0.1</version.release.plugin>
7070
<version.source.plugin>3.3.0</version.source.plugin>
7171
<version.surefire.plugin>2.22.0</version.surefire.plugin>
7272

@@ -433,7 +433,7 @@
433433

434434
<distributionManagement>
435435
<snapshotRepository>
436-
<id>ossrh</id>
436+
<id>ossrh-snapshots</id>
437437
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
438438
</snapshotRepository>
439439
<repository>

0 commit comments

Comments
 (0)