-
Notifications
You must be signed in to change notification settings - Fork 68
chore(format): update google-java-format to 1.25.2 via java-shared-config update #3726
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.
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
Changes from 21 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
b4151db
build(deps): update dependency com.google.cloud:google-cloud-shared-c…
renovate-bot 26ad207
chore: update groupId of formatter to `com.spotify.fmt`
diegomarquezp 2808286
chore: format with google-java-format 1.25.2
diegomarquezp 58f59e9
chore(ci): run lint check job on java 17
diegomarquezp d854040
chore(ci): skip fmt check in java 11 mvn tasks
diegomarquezp 4f46aa2
feat(hermetic-build): use java 17 in Docker image
diegomarquezp c824163
chore: generate libraries at Fri Mar 28 20:33:10 UTC 2025
cloud-java-bot e454b1e
Revert "chore: generate libraries at Fri Mar 28 20:33:10 UTC 2025"
diegomarquezp 1443660
temporarily prevent cloud java bot updates
diegomarquezp 3dedf0c
chore: format java-showcase
diegomarquezp 1973ef5
chore: format showcase test files
diegomarquezp 1d55f6c
chore: update shared dependencies to java 17
diegomarquezp da1a26f
chore: formatter dependency is managed by java-shared-config
diegomarquezp 11ce72a
Merge branch 'update-sharedconfig-and-lint' of https://github.com/goo…
diegomarquezp d5527da
chore: skip fmt check in Airlock docker image
diegomarquezp 134a4a2
chore: infer the google-java-format version in the Airlock Docker image
diegomarquezp 76c1846
chore: use java 17 in java8 compatibility check
diegomarquezp 7147c8e
chore: format showcase files
diegomarquezp 5292d7a
chore: update contribution guidelines to use spotify group ID
diegomarquezp 36d9ee4
chore: update fmt plugin in gapic showcase
diegomarquezp 57e530f
chore: revert format changes temporarily for review
diegomarquezp e975139
Revert "chore: revert format changes temporarily for review"
diegomarquezp 6b5c220
restore hermetic generation workflow
diegomarquezp 23681cc
Revert "restore hermetic generation workflow"
diegomarquezp a3e10d0
chore: generate libraries at Tue Apr 1 18:42:50 UTC 2025
cloud-java-bot 0023fab
sync dockerfiles
diegomarquezp 454a933
Merge remote-tracking branch 'origin' into update-sharedconfig-and-lint
diegomarquezp 0942ea3
Merge remote-tracking branch 'refs/remotes/origin/update-sharedconfig…
diegomarquezp 5bfdf7f
update Dockerfile
diegomarquezp 403bedf
do not transfer problematic file
diegomarquezp 808c115
no cache
diegomarquezp a18245b
update golden and generator in cloudbuild job
diegomarquezp 2bd03cb
fix jar copy
diegomarquezp 14f689e
remove redundant switch
diegomarquezp ea4d580
restore library generation
diegomarquezp File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,9 @@ | |
| # downstream client libraries before they are released. | ||
| name: Hermetic library generation upon generation config change through pull requests | ||
| on: | ||
| pull_request: | ||
| # TODO: uncomment this before merging to prevent a formatting regression | ||
|
||
| #pull_request: | ||
| workflow_dispatch: | ||
|
|
||
| env: | ||
| REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }} | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is
library_generation_airlock.Dockerfileused for? What is the difference between it andlibrary_generation.Dockerfile?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a Airlock variant of our Dockerfile. It was introduced in #3472 and it seemingly is a reflection of the original one, but fetching the images from Airlock (this is compatible with Cloud Build).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should probably have a way to share the common code between the two, or maybe only keep the airlock one if it can be used locally as well. Otherwise these two files can easily get diverged from each other as they evolve. This is a separate future enhancement though.