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.

Sign up for GitHub

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

Jump to bottom

fix(documentation): corebaseline is also used for other versions than LTS. #6752

Merged
merged 1 commit into from
Oct 8, 2023
Merged

fix(documentation): corebaseline is also used for other versions than LTS. #6752

merged 1 commit into from
Oct 8, 2023

Conversation

gounthar
Copy link
Contributor

@gounthar gounthar commented Oct 8, 2023 •
edited
Loading

Attempting to rectify the errors I introduced recently.

When I introduced the use of updatecli in #6717, I also removed content/_layouts/corebaseline.html.haml. This Ruby script calculates the various LTS versions that we can find in different parts of the documentation. It's also responsible for determining various weekly versions mentioned in other sections of the documentation, which I regrettably overlooked. 🤦

This is why we need to retain it until we address the other usages with updatecli.

@MarkEWaite spotted my mistake in #6749 and corrected it in #6751. However, because the Ruby script was still missing, it didn't work.

Consequently, I'm proposing this PR to reintegrate the original script so that the website can once again generate references for Jenkins weekly versions correctly. Next week, I'll suggest a way to automate this with updatecli.

@gounthar
fix(documentation): corebaseline is also used for other versions than…
e53cd88 
… LTS.

We have to keep it until we address the other uses.
@gounthar gounthar requested a review from a team as a code owner October 8, 2023 12:27
MarkEWaite
MarkEWaite approved these changes Oct 8, 2023
View reviewed changes
Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

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

Thanks for the fix!

@MarkEWaite MarkEWaite enabled auto-merge (squash) October 8, 2023 12:32
@MarkEWaite MarkEWaite merged commit 7133bf5 into jenkins-infra:master Oct 8, 2023
3 checks passed
@gounthar gounthar deleted the jenkins-version branch October 8, 2023 12:34
@gounthar
Copy link
Contributor Author

gounthar commented Oct 8, 2023

This PR has solved the problem locally (on my machine), but it does not seem to be fixed on jenkins.io.
Is there a cache somewhere between jenkins.io and my machine, or will the fix take time to propagate?

@gounthar gounthar restored the jenkins-version branch October 8, 2023 13:14
@lemeurherve
Copy link
Member

This PR has solved the problem locally (on my machine), but it does not seem to be fixed on jenkins.io. Is there a cache somewhere between jenkins.io and my machine, or will the fix take time to propagate?

@gounthar yes, jenkins.io is cached with Fastly. If you need to decache specific page(s), call curl -X PURGE https://jenkins.io/<specific-page>

@lemeurherve
Copy link
Member

lemeurherve commented Oct 8, 2023 •
edited
Loading

Also, you should delete merged branches so Jenkins won't try to build it again, cf

image

@gounthar
Copy link
Contributor Author

gounthar commented Oct 8, 2023 •
edited
Loading

Got it, thanks.
I was keeping the branch to make another PR, but I guess that's not such a good idea. 🤷

@gounthar gounthar deleted the jenkins-version branch October 8, 2023 13:23
@lemeurherve
Copy link
Member

lemeurherve commented Oct 8, 2023 •
edited
Loading

I was keeping the branch to make another PR, but I guess that's not such a good idea. 🤷

You can keep your local branch for that, but there is no need to restore it on GitHub: it will be restored when you'll push it again when you're ready.

abhishekmaity added a commit to abhishekmaity/jenkins.io that referenced this pull request Oct 9, 2023
@abhishekmaity @Pldi23
@zbynek @renovate @jenkins-infra-changelog-generator @MarkEWaite @jtnord @ammanders @raul-arabaolaza @julieheard @kmartens27 @github-actions @gounthar @NotMyFault @daniel-beck @basil
updated (#2)
b56d5f4 
* script update for prototype js removal (jenkins-infra#6730)

* script update for prototype js removal

* script update for prototype js removal

* Update content/blog/2023/05/12/2023-05-12-removing-prototype-from-jenkins.adoc

Co-authored-by: Zbynek Konecny <[email protected]>

---------

Co-authored-by: Zbynek Konecny <[email protected]>

* Update dependency bootstrap to v5.3.2 (jenkins-infra#6727)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Automated changelog for 2.426 (jenkins-infra#6707)

* Automated changelog for 2.426

* Edits to fix layout

* Link to JEP-237

* Add docker container entry to 2.426 changelog

* Fix 2.426 release date

---------

Co-authored-by: jenkins-infra-changelog-generator <86592549+jenkins-infra-changelog-generator[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <[email protected]>

* [JEP-237] Introduce initial documentation for FIPS-140 (jenkins-infra#6675)

* [JEP-237] Introduce initial administration documentation for FIPS-140

Add user facing documentation for https://github.com/jenkinsci/jep/blob/master/jep/237/README.adoc

* [JEP-237] Introduce initial developer documentaion for FIPS-130

Adds developer facing documentation to allow them to better understand
what constitutes compliant vs non compliant code.

* Apply suggestions from code review

Co-authored-by: Anita Manders <[email protected]>
Co-authored-by: Raúl Arabaolaza Barquin <[email protected]>

* [JEP-237] add example and document KeyStore

* Apply suggestions from code review

Co-authored-by: Julie Heard <[email protected]>

* Apply suggestions from code review

Co-authored-by: Anita Manders <[email protected]>

* fix indentation

* add admonition

* tweaks and s/FIPS/FIPS-140/

* rework note on using libraries

* Fix admonition

* fix link to system property

* update some more links

* Apply suggestions from Mark Waite

Co-authored-by: Mark Waite <[email protected]>

* Add level 1 heading that I mistakenly suggested for removal

* Remove trailing blank from new content

* Removing trailing blank from new content

---------

Co-authored-by: Anita Manders <[email protected]>
Co-authored-by: Raúl Arabaolaza Barquin <[email protected]>
Co-authored-by: Julie Heard <[email protected]>
Co-authored-by: Kevin Martens <[email protected]>
Co-authored-by: Mark Waite <[email protected]>

* [Python Tutorial] Bump Python alpine docker image version to 3.12.0-alpine3.18 (jenkins-infra#6733)

* chore: Update the value of the python docker image for pipelines in t...

... he 'Hello World!' tutorial

Made with ❤️️ by updatecli

* chore: Update the value of the python docker image for scripts in the...

...  'build-a-python-app-with-pyinstaller.adoc' tutorial

Made with ❤️️ by updatecli

* chore: Update the value of the python docker image for scripts in the...

...  'Hello World!' tutorial

Made with ❤️️ by updatecli

---------

Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>

* Update dependency faraday to v2.7.11 (jenkins-infra#6734)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency rss to v0.3.0 (jenkins-infra#6737)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency crate-ci/typos to v1.16.17 (jenkins-infra#6738)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update jenkinsciinfra/builder Docker tag to v2.2.68 (jenkins-infra#6735)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* feat(dependencies): Tracks Jenkins' three last LTS versions. (jenkins-infra#6717)

* feat(scripts): Gets the last three LTS releases.

* feat(scripts): Gets the last three LTS releases.

* fix(scripts): Comments

* feat(dependencies): Tracks and updates last three Jenkins LTS versions.

* feat(dependencies): Tracks and updates last three Jenkins LTS versions.

* feat(dependencies): Tracks last 3 Jenkins' LTS releases.

* fix(dependencies): Messages are now more accurate.

* fix(dependencies): Posix, mi amor.

* fix(dependencies): Posix, mon amour.

* fix(dependencies): No need to "x" the script anymore.

* fix(dependencies): Removed core-baseline

* fix(dependencies): Removes the core-baseline layout.

* Update choosing-jenkins-baseline.adoc

* Update update-base-jenkins-version.adoc

---------

Co-authored-by: Kevin Martens <[email protected]>

* Update jenkinsciinfra/builder Docker tag to v3 (jenkins-infra#6740)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump Jenkins LTS versions to 2.414.2 in various parts of the documentation (jenkins-infra#6744)

* chore: Bump Jenkins minimum BOM artifact version in the "dependency m...

... anagement" page

Made with ❤️️ by updatecli

* chore: Bump Jenkins minimum BOM artifact in the "plugin-bill-of-mater...

... ials" page

Made with ❤️️ by updatecli

* chore: Bump Jenkins minimum BOM artifact version in the "plugin-bill-...

... of-materials" page

Made with ❤️️ by updatecli

* chore: Bump Jenkins minimum BOM artifact in the "dependency managemen...

... t" page

Made with ❤️️ by updatecli

---------

Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>

* Update node.js from 18.x to 20.x (jenkins-infra#6741)

* Add redirect for `hudson.model.UsageStatistics.disabled` property (jenkins-infra#6745)

Co-authored-by: Daniel Beck <[email protected]>

* [Hello World Tutorial] Bump Golang alpine docker image version to 1.21.2-alpine3.18 (jenkins-infra#6746)

chore: Update the value of the golang docker image for pipelines in t...

... he 'Hello World!' tutorial

Made with ❤️️ by updatecli

Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>

* Remove link to private topic in community (jenkins-infra#6748)

Remove link to private community thread

The organizers of the 2021 Hacktoberfest project to localize in French
are not participating in HAcktoberfest 2023 in Jenkins.  The thread in
community.jenkins.io was made private at the end of the 2021 effort.

The remaining links are useful and the French localization effort is
still a good effort to continue.

* Restore placeholder calculation for version selection page (jenkins-infra#6751)

Calculate placeholders in the baseline selection file

Removing the placeholder processing left placeholder text.

Fixes jenkins-infra#6748

* Bump Jenkins LTS versions to 2.414.2 in various parts of the documentation (jenkins-infra#6750)

* chore: Bump Jenkins minimum BOM artifact version in the "plugin-bill-...

... of-materials" page

Made with ❤️️ by updatecli

* chore: Bump Jenkins minimum BOM artifact version in the "dependency m...

... anagement" page

Made with ❤️️ by updatecli

* chore: Bump Jenkins minimum BOM artifact version in the "improve a pl...

... ugin tutorial"

Made with ❤️️ by updatecli

---------

Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>

* fix(documentation): corebaseline is also used for other versions than LTS. (jenkins-infra#6752)

We have to keep it until we address the other uses.

* Add "Prototype removed" blog post (jenkins-infra#6742)

* Add "Prototype removed" blog post

* Update publication date

---------

Co-authored-by: Mark Waite <[email protected]>

---------

Co-authored-by: Dmitry Platonov <[email protected]>
Co-authored-by: Zbynek Konecny <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: jenkins-infra-changelog-generator[bot] <86592549+jenkins-infra-changelog-generator[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <[email protected]>
Co-authored-by: James Nord <[email protected]>
Co-authored-by: Anita Manders <[email protected]>
Co-authored-by: Raúl Arabaolaza Barquin <[email protected]>
Co-authored-by: Julie Heard <[email protected]>
Co-authored-by: Kevin Martens <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Bruno Verachten <[email protected]>
Co-authored-by: Alexander Brandes <[email protected]>
Co-authored-by: Daniel Beck <[email protected]>
Co-authored-by: Daniel Beck <[email protected]>
Co-authored-by: Basil Crow <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkEWaite MarkEWaite MarkEWaite approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gounthar @lemeurherve @MarkEWaite