Skip to content

Commit ddd61f8

Browse files
committed
Remove skip staging
1 parent 41d1e9f commit ddd61f8

File tree

2 files changed

+22
-43
lines changed

2 files changed

+22
-43
lines changed

.github/workflows/deploy.yml

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@ on:
88
default: true
99
type: boolean
1010

11-
skip-deploy:
12-
description: "Skip deployment step"
13-
default: false
14-
type: boolean
15-
16-
skip-pages:
17-
description: "Skip page publishing step"
18-
default: false
19-
type: boolean
20-
2111
skip-initial-verification:
2212
description: "Skip tests, dependency check, formatting, licenses"
2313
default: false
@@ -104,18 +94,14 @@ jobs:
10494
"-DskipTests"
10595
"-Dlicense.skip=true"
10696
"-Dcheckstyle.skip=true"
97+
"-Preleases"
98+
'-P!acceptance-tests'
10799
)
108-
109-
build_goals=()
110-
if [[ '${{ inputs.skip-deploy }}' == 'true' ]]; then
111-
build_goals+=("clean" "package" "javadoc:jar" "javadoc:javadoc")
112-
build_goals+=("${build_args[@]}")
113-
else
114-
build_goals+=("release:prepare" "release:perform" "javadoc:javadoc")
115-
fi
116100
117101
run <<-SCRIPT
118102
./mvnw -B -e \
103+
-Preleases \
104+
'-P!acceptance-tests' \
119105
--no-transfer-progress \
120106
-Darguments='${build_args[@]}' \
121107
-DdryRun='${{ inputs.dry-run }}' \
@@ -125,7 +111,7 @@ jobs:
125111
-DsignTag=false \
126112
-Dstyle.color=always \
127113
-Dtag='v${release_version}' \
128-
${build_goals[@]}
114+
release:prepare release:perform
129115
SCRIPT
130116
131117
success "Release has been performed successfully"
@@ -135,12 +121,3 @@ jobs:
135121
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
136122
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
137123

138-
- name: Upload JavaDocs as a build artifact
139-
uses: actions/upload-pages-artifact@v1
140-
with:
141-
path: java-compiler-testing/target/apidocs
142-
143-
- name: Deploy JavaDocs build artifact to GitHub Pages
144-
if: ${{ ! inputs.dry-run }} && ${{ ! inputs.skip-pages }}
145-
id: deployment
146-
uses: actions/deploy-pages@v1

pom.xml

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
<modules>
3535
<module>java-compiler-testing</module>
36-
<module>acceptance-tests</module>
3736
</modules>
3837

3938
<inceptionYear>2022</inceptionYear>
@@ -89,7 +88,7 @@
8988
<url>scm:git:${project.url}</url>
9089
<connection>scm:git:${project.url}</connection>
9190
<developerConnection>scm:git:${project.url}</developerConnection>
92-
<tag>v0.0.1-M1</tag>
91+
<tag>vHEAD</tag>
9392
</scm>
9493

9594
<properties>
@@ -621,20 +620,8 @@
621620
<keepStagingRepositoryOnFailure>true</keepStagingRepositoryOnFailure>
622621
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
623622
<serverId>ossrh</serverId>
624-
<skipLocalStaging>true</skipLocalStaging>
625-
<skipStaging>true</skipStaging>
626623
<updateReleaseInfo>true</updateReleaseInfo>
627624
</configuration>
628-
629-
<executions>
630-
<execution>
631-
<id>default-deploy</id>
632-
<phase>deploy</phase>
633-
<goals>
634-
<goal>deploy</goal>
635-
</goals>
636-
</execution>
637-
</executions>
638625
</plugin>
639626
</plugins>
640627
</pluginManagement>
@@ -735,11 +722,26 @@
735722
</build>
736723
</profile>
737724

725+
<profile>
726+
<id>acceptance-tests</id>
727+
<activation>
728+
<activeByDefault>true</activeByDefault>
729+
</activation>
730+
731+
<modules>
732+
<!--
733+
Activate these here so that they do not appear when Nexus is being
734+
invoked
735+
-->
736+
<module>acceptance-tests</module>
737+
</modules>
738+
</profile>
739+
738740
<profile>
739741
<id>releases</id>
742+
740743
<build>
741744
<plugins>
742-
743745
<plugin>
744746
<groupId>org.apache.maven.plugins</groupId>
745747
<artifactId>maven-source-plugin</artifactId>

0 commit comments

Comments
 (0)