Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ jobs:
cache: 'maven'
- name: 'Install'
shell: bash
run: ./mvnw -B -ntp -Dtoolchain.skip install -U -DskipTests=true -f $ROOT_POM
run: ./mvnw -B -Dtoolchain.skip install -U -DskipTests=true -f $ROOT_POM
- name: 'Test'
shell: bash
run: ./mvnw -B -ntp -P!standard-with-extra-repos -Dtoolchain.skip verify -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
run: ./mvnw -B -P!standard-with-extra-repos -Dtoolchain.skip verify -U -Dmaven.javadoc.skip=true -Dsurefire.toolchain.version=${{ matrix.java }} -f $ROOT_POM
- name: 'Print Surefire reports'
# Note: Normally a step won't run if the job has failed, but this causes it to
if: ${{ failure() }}
Expand Down
2 changes: 1 addition & 1 deletion util/deploy_snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set -e -u

function mvn_deploy() {
./mvnw -ntp -DskipTests=true clean deploy "$@"
./mvnw -DskipTests=true clean deploy "$@"
}

echo "Publishing Maven snapshot..."
Expand Down
4 changes: 0 additions & 4 deletions util/gradle_integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,24 @@ set -eu
--projects '!guava-testlib,!guava-tests,!guava-bom,!guava-gwt' \
-Dmaven.test.skip=true \
-Dmaven.javadoc.skip=true \
-ntp \
clean install
./mvnw \
-f android \
--projects '!guava-testlib,!guava-tests,!guava-bom' \
-Dmaven.test.skip=true \
-Dmaven.javadoc.skip=true \
-ntp \
clean install

# We run these separately so that their changes to the default toolchain doesn't affect anything else.
# (And we run them after the main build so that that build has already downloaded Java 11/17 if necessary.)

./mvnw \
--projects '!guava-testlib,!guava-tests,!guava-bom,!guava-gwt' \
-ntp \
initialize -P print-java-11-home
JAVA_11_HOME=$(<target/java_11_home)

./mvnw \
--projects '!guava-testlib,!guava-tests,!guava-bom,!guava-gwt' \
-ntp \
initialize -P print-java-17-home
JAVA_17_HOME=$(<target/java_17_home)

Expand Down
Loading