Skip to content

Commit 7bab619

Browse files
chore: merge main into generate-libraries-main
2 parents 82081bf + 23b4b12 commit 7bab619

File tree

7 files changed

+14
-12
lines changed

7 files changed

+14
-12
lines changed

.github/workflows/nightly.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
cache: maven
2525
- run: mvn -version
2626
- name: Install
27-
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip
27+
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -Dfmt.skip
2828
- name: Create issue if previous step fails
2929
if: ${{ failure() }}
3030
env:
@@ -49,7 +49,7 @@ jobs:
4949
cache: maven
5050
- run: mvn -version
5151
- name: Install with Java 11
52-
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests
52+
run: mvn install --errors --batch-mode --no-transfer-progress -Dcheckstyle.skip -DskipTests -Dfmt.skip
5353

5454
- uses: actions/setup-java@v4
5555
with:
@@ -58,11 +58,11 @@ jobs:
5858
- run: mvn -version
5959
- name: Test with Java 8
6060
# Direct goal invocation ("surefire:test") prevents recompiling tests
61-
run: mvn surefire:test --errors --batch-mode --no-transfer-progress
61+
run: mvn surefire:test --errors --batch-mode --no-transfer-progress -Dfmt.skip
6262
- name: Create issue if previous step fails
6363
if: ${{ failure() }}
6464
env:
65-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
65+
GITHUB_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
6666
run: |
6767
gh issue create \
6868
--title "Nightly-java8 build on ${{ matrix.os }} failed." \

hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- uses: actions/setup-java@v4
105105
with:
106106
distribution: temurin
107-
java-version: 11
107+
java-version: 17
108108
- run: java -version
109109
- run: .kokoro/build.sh
110110
env:

hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/samples.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/setup-java@v4
2525
with:
2626
distribution: temurin
27-
java-version: 8
27+
java-version: 17
2828
- name: Run checkstyle
2929
run: mvn -P lint --quiet --batch-mode checkstyle:check
3030
working-directory: samples/snippets

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ set +e
5555
case ${JOB_TYPE} in
5656
test)
5757
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
58-
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
58+
mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
5959
RETURN_CODE=$?
6060
;;
6161
lint)
62-
mvn com.coveo:fmt-maven-plugin:check -B -ntp
62+
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
6363
RETURN_CODE=$?
6464
;;
6565
javadoc)
66-
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
66+
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
6767
RETURN_CODE=$?
6868
;;
6969
integration)
@@ -75,13 +75,14 @@ integration)
7575
-Denforcer.skip=true \
7676
-Dcheckstyle.skip=true \
7777
-DskipUnitTests=true \
78+
-Dfmt.skip=true \
7879
-fae \
7980
verify
8081
RETURN_CODE=$?
8182
;;
8283
graalvm)
8384
# Run Unit and Integration Tests with Native Image
84-
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
85+
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
8586
RETURN_CODE=$?
8687
;;
8788
samples)
@@ -105,6 +106,7 @@ samples)
105106
-DtrimStackTrace=false \
106107
-Dclirr.skip=true \
107108
-Denforcer.skip=true \
109+
-Dfmt.skip=true \
108110
-fae \
109111
verify
110112
RETURN_CODE=$?
@@ -114,7 +116,7 @@ samples)
114116
fi
115117
;;
116118
clirr)
117-
mvn -B -ntp -Denforcer.skip=true clirr:check
119+
mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
118120
RETURN_CODE=$?
119121
;;
120122
*)
@@ -136,4 +138,4 @@ then
136138
fi
137139

138140
echo "exiting with ${RETURN_CODE}"
139-
exit ${RETURN_CODE}
141+
exit ${RETURN_CODE}

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-a.cfg renamed to hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg

File renamed without changes.

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-b.cfg renamed to hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg

File renamed without changes.

hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-c.cfg renamed to hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg

File renamed without changes.

0 commit comments

Comments
 (0)