Skip to content

fix: use spotify formatter in hermetic build templates #3752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2025
Merged

fix: use spotify formatter in hermetic build templates #3752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33b0148
fix: use spotify formatter in hermetic build templates
diegomarquezp Apr 22, 2025
019e3c7
chore: use java 17 in lint job
diegomarquezp Apr 22, 2025
c8a3f24
chore: skip fmt check in other ci jobs
diegomarquezp Apr 22, 2025
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
2 changes: 1 addition & 1 deletion hermetic_build/library_generation/owlbot/templates/java_library/.github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
- run: java -version
- run: .kokoro/build.sh
env:
Expand Down
14 changes: 8 additions & 6 deletions hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ set +e
case ${JOB_TYPE} in
test)
echo "SUREFIRE_JVM_OPT: ${SUREFIRE_JVM_OPT}"
mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
mvn test -B -ntp -Dfmt.skip=true -Dclirr.skip=true -Denforcer.skip=true ${SUREFIRE_JVM_OPT}
RETURN_CODE=$?
;;
lint)
mvn com.coveo:fmt-maven-plugin:check -B -ntp
mvn com.spotify.fmt:fmt-maven-plugin:check -B -ntp
RETURN_CODE=$?
;;
javadoc)
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
mvn javadoc:javadoc javadoc:test-javadoc -B -ntp -Dfmt.skip=true
RETURN_CODE=$?
;;
integration)
Expand All @@ -75,13 +75,14 @@ integration)
-Denforcer.skip=true \
-Dcheckstyle.skip=true \
-DskipUnitTests=true \
-Dfmt.skip=true \
-fae \
verify
RETURN_CODE=$?
;;
graalvm)
# Run Unit and Integration Tests with Native Image
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test
mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative test -Dfmt.skip=true
RETURN_CODE=$?
;;
samples)
Expand All @@ -105,6 +106,7 @@ samples)
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dfmt.skip=true \
-fae \
verify
RETURN_CODE=$?
Expand All @@ -114,7 +116,7 @@ samples)
fi
;;
clirr)
mvn -B -ntp -Denforcer.skip=true clirr:check
mvn -B -ntp -Dfmt.skip=true -Denforcer.skip=true clirr:check
RETURN_CODE=$?
;;
*)
Expand All @@ -136,4 +138,4 @@ then
fi

echo "exiting with ${RETURN_CODE}"
exit ${RETURN_CODE}
exit ${RETURN_CODE}
Loading