Skip to content

Commit eebbf09

Browse files
committed
review update
1 parent 85bf253 commit eebbf09

4 files changed

Lines changed: 36 additions & 20 deletions

File tree

.github/workflows/prepare-release-3.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ on:
2727
description: 'Optional bootstrap generator version for circular dependency validation'
2828
required: false
2929
type: string
30-
dry_run:
31-
description: 'Validate and build without publishing/releasing artifacts (PR is still created)'
32-
required: true
33-
default: 'true'
34-
type: choice
35-
options:
36-
- 'true'
37-
- 'false'
38-
3930
permissions:
4031
contents: write
4132
pull-requests: write
@@ -44,8 +35,6 @@ jobs:
4435
prepare:
4536
runs-on: ubuntu-latest
4637
env:
47-
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
48-
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
4938
CODEGEN_VERSION: ${{ inputs.codegen_version }}
5039
NEXT_CODEGEN_SNAPSHOT_VERSION: ${{ inputs.next_codegen_snapshot_version }}
5140
RELEASE_GENERATORS: ${{ inputs.release_generators }}
@@ -66,6 +55,9 @@ jobs:
6655

6756
- name: Set up Java and Maven
6857
uses: actions/setup-java@v5
58+
env:
59+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
60+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
6961
with:
7062
java-version: '17'
7163
distribution: temurin

.github/workflows/release-codegen-3.yml

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,7 @@ on:
5353
- 'false'
5454

5555
permissions:
56-
contents: write
57-
pull-requests: write
58-
59-
env:
60-
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
61-
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
62-
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
56+
contents: read
6357

6458
jobs:
6559
validate:
@@ -89,6 +83,10 @@ jobs:
8983

9084
- name: Set up Java and Maven
9185
uses: actions/setup-java@v5
86+
env:
87+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
88+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
89+
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
9290
with:
9391
java-version: '17'
9492
distribution: temurin
@@ -128,6 +126,9 @@ jobs:
128126

129127
- name: Set up Java and Maven
130128
uses: actions/setup-java@v5
129+
env:
130+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
131+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
131132
with:
132133
java-version: '17'
133134
distribution: temurin
@@ -166,6 +167,10 @@ jobs:
166167

167168
- name: Set up Java and Maven
168169
uses: actions/setup-java@v5
170+
env:
171+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
172+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
173+
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
169174
with:
170175
java-version: '17'
171176
distribution: temurin
@@ -202,6 +207,8 @@ jobs:
202207
203208
codegen:
204209
runs-on: ubuntu-latest
210+
permissions:
211+
contents: write
205212
needs:
206213
- validate
207214
- generators
@@ -218,6 +225,10 @@ jobs:
218225

219226
- name: Set up Java and Maven
220227
uses: actions/setup-java@v5
228+
env:
229+
MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
230+
MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
231+
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PRIVATE_PASSPHRASE }}
221232
with:
222233
java-version: '17'
223234
distribution: temurin
@@ -437,7 +448,14 @@ jobs:
437448
438449
post_release_pr:
439450
runs-on: ubuntu-latest
440-
needs: codegen
451+
permissions:
452+
contents: write
453+
pull-requests: write
454+
needs:
455+
- codegen
456+
- docker
457+
- online_deploy
458+
if: always() && needs.codegen.result == 'success' && (needs.docker.result == 'success' || needs.docker.result == 'skipped') && (needs.online_deploy.result == 'success' || needs.online_deploy.result == 'skipped')
441459
env:
442460
NEXT_CODEGEN_SNAPSHOT_VERSION: ${{ needs.codegen.outputs.next_codegen_snapshot_version }}
443461
GENERATORS_VERSION: ${{ needs.codegen.outputs.generators_version }}

CI/release/common.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ maven_project_version() {
6262
mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec
6363
}
6464

65+
maven_property_value() {
66+
local property_name="$1"
67+
mvn -q -Dexec.executable="echo" -Dexec.args="\${${property_name}}" --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec
68+
}
69+
6570
curl_metadata() {
6671
local url="$1"
6772
curl --fail --silent --show-error --location --retry 5 --retry-delay 2 --connect-timeout 20 --max-time 90 "${url}"

CI/release/resolve-release-versions.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ else
9696
generators_version="${generators_version_override}"
9797
require_release_version "generators_version_override" "${generators_version}"
9898
else
99-
generators_version="$(latest_released_generators_version)"
99+
generators_version="$(maven_property_value "swagger-codegen-generators-version")"
100+
require_release_version "swagger-codegen-generators-version from pom.xml" "${generators_version}"
100101
fi
101102
bootstrap_generators_version="${generators_version}"
102103

0 commit comments

Comments
 (0)