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

build: bump gradle 6.9.2 -> 8.2.1 #49

Merged
merged 5 commits into from
Aug 21, 2023
Merged

Conversation

jdrueckert
Copy link
Member

@jdrueckert jdrueckert commented Jul 12, 2023

Relates to MovingBlocks/Terasology#5109
Relates to MovingBlocks/Terasology#4653

Contains

  • Updating gradle from 6.9.2 -> 8.2.1
  • Updating gradle's files which became invalid

How to test

  1. Go into your Terasology workspace
  2. Run groovyw lib get CrashReporter
  3. In libs/CrashReporter check out this branch
  4. Start Terasology and provoke a crash (e.g. by checking out commit 97f180b1513151ee787d2b0d78cad5c1fc861a2c in the engine repo)
  5. Check that CrashReporter opens and works fine

Remarks

Java 20 is not yet supported, see gradle/gradle#23488.

@jdrueckert
Copy link
Member Author

Checks are failing, but it looks like they were failing before...?

@jdrueckert jdrueckert marked this pull request as ready for review July 12, 2023 18:54
@BenjaminAmos
Copy link

Is this possibly related to the failing test? It appears to try and fetch a client certificate to authenticate against the drive API with.

private static PrivateKey getPrivateKey() throws IOException, GeneralSecurityException {
// fetch the key of the service account used for the Google Drive API
// key is deployed as k8s secret and mounted into Jenkins userContent directory
// key file can be managed/rotated via Google Cloud Platform
URL website = new URL("https://jenkins.terasology.io/cjoc/userContent/gooey-drive-371f4f7d4d08.p12");
try (InputStream keyStream = website.openStream()) {
return SecurityUtils.loadPrivateKeyFromKeyStore(
SecurityUtils.getPkcs12KeyStore(),
keyStream, "notasecret",
"privatekey", "notasecret");
}
}

jenkins.terasology.io hasn't been up for a while now.

@jdrueckert jdrueckert changed the title build: bump gradle 6.9.2 -> 8.2 build: bump gradle 6.9.2 -> 8.2.1 Jul 30, 2023
@jdrueckert
Copy link
Member Author

Good find @BenjaminAmos !
I asked @Cervator on Discord, whether they gooey-drive-*.p12 is available on the (in-between) jenkins setup we're currently using.

@Cervator
Copy link
Member

Temp Jenkins is pretty basic and I did not cover much stuff that seemed secondary or tertiary - I wasn't even sure if that file was in use still, I did spot it just the other day when going through the InfraPlayground repo wondering what's needed and what to even automate.

I'm not even sure what it makes sense to let the CR support - the few times we got a (working) use of the GDrive integration it was awkward vs pastebin since you had to go download a file, extract, and view logs locally. It may make more sense to retire it and focus on pastebin

In any case there's a tiny readme section over at https://github.com/MovingBlocks/InfraPlayground/tree/master/jenkins/cbc#setup-google-drive-serviceaccount-key with the file living in the same directory.

Even though we don't use the CBC Jenkins now it doesn't look too complex to sort out and port over, but the big question (to me) remains: should we?

@jdrueckert
Copy link
Member Author

Just tested it via the engine repo and it tests out fine. But as I'm the author of this PR, I cannot approve it.

@jdrueckert jdrueckert merged commit 21af18d into master Aug 21, 2023
4 checks passed
@jdrueckert jdrueckert deleted the build/bump-gradle-to-8.2 branch August 21, 2023 18:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants