Update Groovy libraries to 3.0.23 #8095
Open
Conversation
This file contains 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
matthiasblaesing
added
Groovy
ci:dev-build
…ult) files
1. Check that tests run clean with the base JDK (for this commit 17)
2. Remove all existing reference files:
find . -regextype egrep -regex '.*\.(occurrences|completion|folds|indexed|semantic|ccresult)' -exec rm {} \;
3. Rebuild the reference files by running unittests
4. Rerun unittests to verify all green
Return type from findAll changed from Collection to List
Workflow:
1. Update the groovy version
2. Remove all reference files:
find . -regextype egrep -regex '.*\.(occurrences|completion|folds|indexed|semantic|ccresult)' -exec rm {} \;
3. Rebuild the reference files by running the unittests with the base
JDK (17 for this commit)
4. Review the difference
5. Commit the change with the updated reference files
6. Add JDK specific variants by:
6a: Removing all existing reference files:
find . -regextype egrep -regex '.*\.(occurrences|completion|folds|indexed|semantic|ccresult)' -exec rm {} \;
6b: Rerun unittests with the target JDK
6c: Move the changed reference files to their version specific name
(21 is the JDK version in this case and needs to be adjusted):
for i in `git status -s | cut --delimiter " " -f 3`; do mv $i ${i%.*}.21.completion; git checkout $i; done
6d: Amend the changes to the base commit
matthiasblaesing
force-pushed
the
groovy-update
branch
from
0794d68 to
cb3c105
Compare
|
hmm. I probably should have done this already in #7415 as cleanup, instead of making sure that everything passes between JDK 8 and 17 (even on EOL JDKs). Maintaining golden files only for JDK 17 and 21 is probably fine for the groovy modules. Some tests will likely fail on JDKs 18-20 but the 17k removed lines are very enticing since it would reduce maintenance overhead. should we let CI also test on JDK 21 when Groovy is set? diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1e5be8f..55b0919 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1827,7 +1827,9 @@
timeout-minutes: 60
strategy:
matrix:
- java: [ '17' ]
+ java: [ '17', '21' ]
+ exclude:
+ - java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
steps: |
|
If noone objects, I intent to merge this next weekend. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Update bundled Groovy to 3.0.23.
To make the real change better visible, in the first commit the reference files (occurrences|completion|folds|indexed|semantic|ccresult) were cleaned up and files for old java versions were dropped. The baseline was raised to JDK 17. In the second step the Groovy update was done, the reference files regenerated for JDK 17 and additional reference files for JDK 21 generated.
The real change can be observed in the changed reference files in the second commit. Only the
findAllmethods gained a more precise return type (fromCollectiontoList).