Skip to content
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

Fix for missing sbt by using new guardian/setup-scala action #24

Merged

Conversation

rtyley
Copy link
Member

@rtyley rtyley commented Oct 15, 2024

Using the new GitHub Action guardian/setup-scala to cope with sbt being removed from the latest Ubuntu images we use for CI. This composite action combines setup-java and setup-sbt with good defaults for the Guardian.

Version of Java used by CI now specified by .tool-versions file

Note that (like gha-scala-library-release-workflow) guardian/setup-scala requires that projects specify their Java version with an asdf-formatted .tool-versions file - we didn't have to add one with this PR, as we already added it for gha-scala-library-release-workflow with 3ec016e.

@rtyley rtyley changed the title Fix for missing sbt by using new guardian/setup-scala action Fix for missing sbt by using new guardian/setup-scala action Oct 15, 2024
@rtyley rtyley force-pushed the fix-for-missing-sbt-by-using-new-guardian-action-setup-scala branch from 18e3c5e to 887e7eb Compare October 15, 2024 15:50
@rtyley rtyley marked this pull request as ready for review October 16, 2024 09:09
@rtyley rtyley requested a review from a team as a code owner October 16, 2024 09:09
Copy link

@emdash-ie emdash-ie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me! I was there while you made it though, so you may want another review.

uses: rtyley/setup-java@patch-1
with:
distribution: corretto
java-version: 17 # Currently Java 17 required by `s3mock-testcontainers`

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question actually: CI is now using 21, as specified in .tool-versions. It looks like this is a change: is that ok?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh my goodness, this is a great point. So actually, it turns out this line, using Java 17 and the comment, is all a copy-n-paste from etag-caching, which does use s3mock - but redirect resolver doesn't use s3mock, so we definitely want to remove this line - and as we've seen, the tests for redirect resolver pass with Java 21!

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! I figured it probably worked since there were no failures, but was curious about what had happened.

@rtyley rtyley merged commit f525402 into main Oct 16, 2024
1 check passed
@emdash-ie emdash-ie deleted the fix-for-missing-sbt-by-using-new-guardian-action-setup-scala branch October 16, 2024 10:05
Divs-B added a commit to guardian/play-secret-rotation that referenced this pull request Oct 16, 2024
See more at guardian/redirect-resolver#24

Co-authored-by: Emily Bourke <emily.bourke@guardian.co.uk>
Divs-B added a commit to guardian/play-googleauth that referenced this pull request Oct 16, 2024
See more at: guardian/redirect-resolver#24

Co-authored-by: Emily Bourke <emily.bourke@guardian.co.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants