Skip to content

Commit fa90701

Browse files
committed
Merge tag 'github-api-1.329' into release/v1.x
github-api-1.329
2 parents 84fae98 + b33c8ed commit fa90701

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

.github/workflows/create_release_tag_and_pr.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ jobs:
2121
distribution: 'temurin'
2222
cache: 'maven'
2323

24-
- name: Reset staging/main
24+
- name: Reset staging
2525
id: staging
2626
run: |
27-
git checkout -B staging/main
28-
git push --set-upstream -f origin staging/main
27+
git checkout -B staging/$GITHUB_REF_NAME
28+
git push --set-upstream -f origin staging/$GITHUB_REF_NAME
29+
env:
30+
GITHUB_REF_NAME: ${{ github.ref_name }}
2931

3032
- name: Set Release Version
3133
id: release
@@ -37,7 +39,7 @@ jobs:
3739
with:
3840
commit_message: "Prepare release (${{ github.actor }}): github-api-${{ steps.release.outputs.version }}"
3941
tagging_message: 'github-api-${{ steps.release.outputs.version }}'
40-
branch: staging/main
42+
branch: staging/${{ github.ref_name }}
4143

4244
- name: Increment Snapshot Version
4345
run: |
@@ -46,12 +48,12 @@ jobs:
4648
- uses: stefanzweifel/git-auto-commit-action@v5
4749
with:
4850
commit_message: "Prepare for next development iteration"
49-
branch: staging/main
51+
branch: staging/${{ github.ref_name }}
5052

51-
- name: pull-request to main
53+
- name: Create pull-request
5254
uses: repo-sync/pull-request@v2
5355
with:
5456
pr_title: "Prepare release (${{ github.actor }}): github-api-${{ steps.release.outputs.version }}"
55-
source_branch: "staging/main"
56-
destination_branch: "main"
57+
source_branch: "staging/${{ github.ref_name }}"
58+
destination_branch: "${{ github.ref_name }}"
5759
github_token: ${{ secrets.GITHUB_TOKEN }}

pom.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.kohsuke</groupId>
44
<artifactId>github-api</artifactId>
5-
<version>1.328</version>
5+
<version>1.329</version>
66
<name>GitHub API for Java</name>
77
<url>https://github-api.kohsuke.org/</url>
88
<description>GitHub API for Java</description>
@@ -18,12 +18,12 @@
1818
<snapshotRepository>
1919
<id>sonatype-nexus-snapshots</id>
2020
<name>Sonatype Nexus Snapshots</name>
21-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
21+
<url>${nexus.serverUrl}/content/repositories/snapshots/</url>
2222
</snapshotRepository>
2323
<repository>
2424
<id>sonatype-nexus-staging</id>
2525
<name>Nexus Release Repository</name>
26-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
26+
<url>${nexus.serverUrl}/service/local/staging/deploy/maven2/</url>
2727
</repository>
2828
<site>
2929
<id>github-pages</id>
@@ -49,6 +49,9 @@
4949

5050
<jacoco.surefire.argLine />
5151
<surefire.argLine />
52+
53+
<!-- This project was registered before 2021, so it uses the old server. -->
54+
<nexus.serverUrl>https://ossrh-staging-api.central.sonatype.com</nexus.serverUrl>
5255
</properties>
5356

5457
<build>

0 commit comments

Comments
 (0)