Skip to content

Commit af36807

Browse files
committed
Fix staging plugin
- Include acceptance tests in release to keep Nexus happy
1 parent b50b79b commit af36807

File tree

19 files changed

+44
-15
lines changed

19 files changed

+44
-15
lines changed

.github/workflows/deploy.yml

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

11-
skip-dependency-scan:
12-
description: "Skip dependency scan"
13-
default: false
14-
type: boolean
15-
1611
skip-deploy:
1712
description: "Skip deployment step"
1813
default: false
@@ -23,8 +18,8 @@ on:
2318
default: false
2419
type: boolean
2520

26-
skip-tests:
27-
description: "Skip tests"
21+
skip-initial-verification:
22+
description: "Skip tests, dependency check, formatting, licenses"
2823
default: false
2924
type: boolean
3025

@@ -61,6 +56,21 @@ jobs:
6156
gpg-passphrase: GPG_PASSPHRASE
6257
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
6358

59+
- name: Ensure all tests pass
60+
if: ${{ ! inputs.skip-initial-verification }}
61+
shell: bash
62+
run: >-
63+
./mvnw
64+
-B
65+
-e
66+
-T4
67+
-U
68+
-P dependency-check
69+
--no-transfer-progress
70+
-Dstyle.color=always
71+
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
72+
clean verify
73+
6474
- name: Configure Git
6575
shell: bash
6676
run: |-
@@ -89,14 +99,13 @@ jobs:
8999
info "Preparing and performing the release"
90100
ensure-set OSSRH_USERNAME OSSRH_TOKEN GPG_PASSPHRASE
91101
92-
build_args=()
93-
if [[ '${{ inputs.skip-dependency-check }}' == 'false' ]]; then
94-
build_args+=("-P" "dependency-check")
95-
fi
96-
if [[ '${{ inputs.skip-tests }}' == 'true' ]]; then
97-
build_args+=("-Dmaven.test.skip" "-DskipTests")
98-
fi
99-
102+
build_args=(
103+
"-Dmaven.test.skip"
104+
"-DskipTests"
105+
"-Dlicense.skip=true"
106+
"-Dcheckstyle.skip=true"
107+
)
108+
100109
build_goals=()
101110
if [[ '${{ inputs.skip-deploy }}' == 'true' ]]; then
102111
build_goals+=("clean" "package" "javadoc:jar")
@@ -120,6 +129,7 @@ jobs:
120129
SCRIPT
121130
122131
success "Release has been performed successfully"
132+
123133
env:
124134
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
125135
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}

acceptance-tests/acceptance-tests-avaje-inject/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-avaje-inject</artifactId>
3030
<name>JCT acceptance tests for Avaje Inject</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<avaje-inject.version>8.11</avaje-inject.version>

acceptance-tests/acceptance-tests-avaje-jsonb/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-avaje-jsonb</artifactId>
3030
<name>JCT acceptance tests for Avaje JSONB</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<avaje-jsonb.version>1.1</avaje-jsonb.version>

acceptance-tests/acceptance-tests-checkerframework/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-checkerframework</artifactId>
3030
<name>JCT acceptance tests for CheckerFramework</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<argLine>

acceptance-tests/acceptance-tests-dagger/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-dagger</artifactId>
3030
<name>JCT acceptance tests for Google Dagger</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<dagger.version>2.44.2</dagger.version>

acceptance-tests/acceptance-tests-error-prone/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-error-prone</artifactId>
3030
<name>JCT acceptance tests for Google ErrorProne</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<argLine>

acceptance-tests/acceptance-tests-google-auto-factory/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-google-auto-factory</artifactId>
3030
<name>JCT acceptance tests for Google AutoFactory</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<auto-factory.version>1.0.1</auto-factory.version>

acceptance-tests/acceptance-tests-google-auto-service/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-google-auto-service</artifactId>
3030
<name>JCT acceptance tests for Google AutoService</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<auto-service.version>1.0.1</auto-service.version>

acceptance-tests/acceptance-tests-google-auto-value/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-google-auto-value</artifactId>
3030
<name>JCT acceptance tests for Google AutoValue</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<auto-value.version>1.10.1</auto-value.version>

acceptance-tests/acceptance-tests-immutables/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
<artifactId>acceptance-tests-immutables</artifactId>
3030
<name>JCT acceptance tests for Immutables</name>
31+
<description>Acceptance test components.</description>
3132

3233
<properties>
3334
<immutables.version>2.9.3</immutables.version>

0 commit comments

Comments
 (0)