Skip to content

Commit 49d62c9

Browse files
committed
downgrade generators back to snapshot version, fix release 3.0.0 workflow
1 parent 0cbd8ff commit 49d62c9

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

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

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ jobs:
8383
echo "generator version: " ${MY_POM_VERSION_GENERATORS}
8484
if [[ $MY_POM_VERSION_GENERATORS =~ ^.*SNAPSHOT$ ]];
8585
then
86-
echo "not releasing snapshot version: " ${MY_POM_VERSION_GENERATORS}
87-
echo "RELEASE_OK=no" >> $GITHUB_ENV
86+
echo "GENERATORS_RELEASE_OK=no" >> $GITHUB_ENV
8887
else
89-
echo "RELEASE_OK=yes" >> $GITHUB_ENV
88+
echo "GENERATORS_RELEASE_OK=yes" >> $GITHUB_ENV
9089
fi
9190
echo "generator version: " ${MY_POM_VERSION_GENERATORS}
9291
echo "SC_VERSION_GENERATORS=${MY_POM_VERSION_GENERATORS}" >> $GITHUB_ENV
@@ -112,22 +111,10 @@ jobs:
112111
export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
113112
mvn clean install -U -Pdocker -DJETTY_TEST_HTTP_PORT=8090 -DJETTY_TEST_STOP_PORT=8089 ${GENERATORS_VERSION_PROPERTY}
114113
- name: Run maven deploy/release for codegen-generators
115-
if: env.RELEASE_OK == 'yes'
114+
if: env.RELEASE_OK == 'yes' && env.GENERATORS_RELEASE_OK == 'yes'
116115
working-directory: generators-repo
117116
run: |
118-
GENERATORS_CURRENT_VERSION=$(mvn -q -Dswagger-codegen-version=3.0.69 -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
119-
if [[ $GENERATORS_CURRENT_VERSION =~ SNAPSHOT$ ]]; then
120-
echo "Version is a snapshot: $GENERATORS_CURRENT_VERSION"
121-
else
122-
GROUP_ID="io.swagger.codegen.v3"
123-
ARTIFACT_ID="swagger-codegen-generators"
124-
if mvn -q dependency:get -DgroupId=${GROUP_ID} -DartifactId=${ARTIFACT_ID} -Dversion=${GENERATORS_CURRENT_VERSION} > /dev/null 2>&1; then
125-
echo "Version ${GENERATORS_CURRENT_VERSION} already exists in Maven Central."
126-
else
127-
echo "Version ${GENERATORS_CURRENT_VERSION} does not exist in Maven Central. Deploying"
128-
mvn --no-transfer-progress -B -Prelease deploy
129-
fi
130-
fi
117+
mvn --no-transfer-progress -B -Prelease deploy
131118
- name: Run maven deploy/release for codegen
132119
if: env.RELEASE_OK == 'yes'
133120
run: |

pom.docker.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@
11071107
</dependencyManagement>
11081108
<properties>
11091109
<maven.compiler.release>8</maven.compiler.release>
1110-
<swagger-codegen-generators-version>1.0.58</swagger-codegen-generators-version>
1110+
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
11111111
<swagger-core-version>2.2.28</swagger-core-version>
11121112
<swagger-core-version-v1>1.6.15</swagger-core-version-v1>
11131113
<swagger-parser-version>2.1.25</swagger-parser-version>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@
12081208
</dependencyManagement>
12091209
<properties>
12101210
<maven.compiler.release>8</maven.compiler.release>
1211-
<swagger-codegen-generators-version>1.0.58</swagger-codegen-generators-version>
1211+
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
12121212
<swagger-core-version>2.2.28</swagger-core-version>
12131213
<swagger-core-version-v1>1.6.15</swagger-core-version-v1>
12141214
<swagger-parser-version>2.1.25</swagger-parser-version>

samples/meta-codegen/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<properties>
122122
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
123123
<swagger-codegen-version>3.0.70</swagger-codegen-version>
124-
<swagger-codegen-generators-version>1.0.58</swagger-codegen-generators-version>
124+
<swagger-codegen-generators-version>1.0.58-SNAPSHOT</swagger-codegen-generators-version>
125125
<maven-plugin-version>1.0.0</maven-plugin-version>
126126
<junit-version>4.13.2</junit-version>
127127
<build-helper-maven-plugin>3.0.0</build-helper-maven-plugin>

0 commit comments

Comments
 (0)