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

ci: update workflows to Java 21 #3191

Merged
merged 7 commits into from Dec 24, 2023

Conversation

grigala
Copy link
Contributor

@grigala grigala commented Sep 20, 2023

Check List:

Following the contributing guidelines will make it easier for us to review and accept your PR.

Co-authored-by: martinfrancois <f.martin@fastmail.com>
Co-authored-by: georgebax <george.baxopoulos@gmail.com>
@grigala grigala force-pushed the upgrade-workflows-from-Java-17-to-21 branch from fd12898 to 53d3026 Compare September 20, 2023 18:04
@grigala grigala marked this pull request as ready for review September 20, 2023 18:05
@scordio
Copy link
Member

scordio commented Sep 20, 2023

@grigala thanks for raising the PR!

I've added more references to #3187 about the Javadoc stylesheet issues we encountered with the past upgrades. Do you plan to take care of it as well?

It's basically about generating the Javadoc locally and checking if anything breaks in the resulting pages. If that's the case, we would need to figure out how to apply the same customizations to the Java 21 base stylesheet (like what I've done in #2621).

@grigala
Copy link
Contributor Author

grigala commented Sep 20, 2023

@grigala thanks for raising the PR!

I've added more references to #3187 about the Javadoc stylesheet issues we encountered with the past upgrades. Do you plan to take care of it as well?

It's basically about generating the Javadoc locally and checking if anything breaks in the resulting pages. If that's the case, we would need to figure out how to apply the same customizations to the Java 21 base stylesheet (like what I've done in #2621).

Sure we are currently on Hackergarten event we will try to do it.

Can you add me, @martinfrancois @georgebax as assignees?

P.S. Greets from Hackergarten Basel team :)

Co-authored-by: grigala <grigalaa@gmail.com>
@martinfrancois
Copy link
Contributor

@grigala thanks for raising the PR!

I've added more references to #3187 about the Javadoc stylesheet issues we encountered with the past upgrades. Do you plan to take care of it as well?

It's basically about generating the Javadoc locally and checking if anything breaks in the resulting pages. If that's the case, we would need to figure out how to apply the same customizations to the Java 21 base stylesheet (like what I've done in #2621).

Unfortunately, you were right, the CSS was broken again in Java 21... But we finally managed to fix it, see the last commit I pushed.

@scordio scordio added this to the 3.26.0 milestone Sep 20, 2023
@scordio scordio added theme: documentation An issue related to documentation theme: CI An issue related to the CI configuration and removed theme: documentation An issue related to documentation theme: CI An issue related to the CI configuration labels Sep 20, 2023
@scordio scordio self-assigned this Sep 21, 2023
@scordio
Copy link
Member

scordio commented Sep 28, 2023

It seems the search results lack highlighting.

Current Javadoc:

Screenshot 2023-09-28 at 18 15 52

With the changes from this PR:

Screenshot 2023-09-28 at 18 15 43

JDK 21 Javadoc:

Screenshot 2023-09-28 at 18 17 48

As a minor point, we might want to remove the bold style from the SEARCH label/hyperlink.

@scordio
Copy link
Member

scordio commented Sep 29, 2023

We would like to generate the Javadoc with Java 21 already in 3.25.0 so I'll have a look at the style for the search results.

@scordio scordio changed the title Update workflows to Java 21 ci: update workflows to Java 21 Dec 23, 2023
@scordio
Copy link
Member

scordio commented Dec 24, 2023

I noticed only now that the stylesheet went a bit far from the baseline that Java 21 provides so I started again from the base stylesheet in 2715b98 and applied the customizations in fc234d6.

@scordio scordio merged commit dde51d9 into assertj:main Dec 24, 2023
11 checks passed
scordio added a commit that referenced this pull request Dec 24, 2023
This also makes the Javadoc stylesheet compatible with
Java 21 and updates highlight.js from 11.5.1 to 11.9.0.

Co-authored-by: martinfrancois <f.martin@fastmail.com>
Co-authored-by: georgebax <georgebax@users.noreply.github.com>
Co-authored-by: grigala <grigalaa@gmail.com>
Co-authored-by: Stefano Cordio <stefano.cordio@gmail.com>
@scordio
Copy link
Member

scordio commented Dec 24, 2023

Thanks for your contribution, @grigala, @martinfrancois, and @georgebax!

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.

Upgrade workflows from Java 17 to 21
3 participants