Skip to content

Commit bf90b34

Browse files
authored
Revert "hotfix: temporarily allow Release workflow to skip mvn deploy to recover 2.2.52 (#5220)" (#5223)
This reverts commit f97c408. The 2.2.52 release has been fully recovered (Maven Central, gh-pages javadocs, Gradle plugin, GitHub release, next-snapshot bump). The temporary skip_deploy workflow input and the verify-phase binding for javadocprep are no longer needed.
1 parent 98a4428 commit bf90b34

2 files changed

Lines changed: 2 additions & 11 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ name: Release
33
on:
44
workflow_dispatch:
55
branches: ["master"]
6-
inputs:
7-
skip_deploy:
8-
description: "Skip 'mvn -Prelease deploy' (use to recover when the current version is already on Maven Central). Runs 'mvn -Prelease verify' instead so javadocs are prepared for gh-pages."
9-
type: boolean
10-
default: false
116

127
jobs:
138
build:
@@ -78,13 +73,9 @@ jobs:
7873
git config --global hub.protocol https
7974
git remote set-url origin https://\${{ secrets.GITHUB_TOKEN }}:x-oauth-basic@github.com/''' + 'swagger-api/swagger-core' + '''.git
8075
- name: Run maven deploy/release
81-
if: env.RELEASE_OK == 'yes' && inputs.skip_deploy != true
76+
if: env.RELEASE_OK == 'yes'
8277
run: |
8378
./mvnw --no-transfer-progress -B -Prelease deploy
84-
- name: Run maven verify (recovery — javadocs only, no Central publish)
85-
if: env.RELEASE_OK == 'yes' && inputs.skip_deploy == true
86-
run: |
87-
./mvnw --no-transfer-progress -B -Prelease verify
8879
- name: Run prepare javadocs script
8980
id: prepareJavadocs
9081
if: env.RELEASE_OK == 'yes'

modules/swagger-annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<executions>
6767
<execution>
6868
<id>copy-resources</id>
69-
<phase>verify</phase>
69+
<phase>deploy</phase>
7070
<goals>
7171
<goal>copy-resources</goal>
7272
</goals>

0 commit comments

Comments
 (0)