Skip to content

Move the repeated CI bootstrap steps into a composite action - #9866

Merged
headius merged 1 commit into
jruby:masterfrom
sampokuokkanen:ci-workflow-dedup
Oct 21, 2026
Merged

headius merged 1 commit into
jruby:masterfrom
sampokuokkanen:ci-workflow-dedup

Conversation

@sampokuokkanen

Copy link
Copy Markdown
Contributor

Nearly every CI job repeated the same block: remove the preinstalled JDKs, set up Java with the Maven cache, build with -Pbootstrap, and bundle install. The copies had drifted: some jobs skipped ci-retry.sh, and the Prism WASM job still used checkout@v3, setup-java@v3 and a system mvn instead of the wrapper.

.github/actions/bootstrap now holds those steps, with inputs for the places where jobs really differ (Java version and distribution, whether to remove the old JDKs, the Maven arguments, bundle install flags). The dist build jobs use it with -Pall.

Linux and macOS builds all go through ci-retry.sh now, which only retries network failures. Windows keeps running the wrapper directly from PowerShell, since ci-retry.sh needs bash.

Also share the Windows env block with a YAML anchor and drop the duplicate rake-test from publish-snapshot's needs.

Nearly every CI job repeated the same block: remove the preinstalled
JDKs, set up Java with the Maven cache, build with -Pbootstrap, and
bundle install. The copies had drifted: some jobs skipped ci-retry.sh,
and the Prism WASM job still used checkout@v3, setup-java@v3 and a
system mvn instead of the wrapper.

.github/actions/bootstrap now holds those steps, with inputs for the
places where jobs really differ (Java version and distribution, whether
to remove the old JDKs, the Maven arguments, bundle install flags). The
dist build jobs use it with -Pall.

Linux and macOS builds all go through ci-retry.sh now, which only
retries network failures. Windows keeps running the wrapper directly
from PowerShell, since ci-retry.sh needs bash.

Also share the Windows env block with a YAML anchor and drop the
duplicate rake-test from publish-snapshot's needs.

@headius headius left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Good cleanup. Always meant to do this but never got around to it.

@headius headius added this to the Non-Release milestone Oct 21, 2026
@headius
headius merged commit 0d03017 into jruby:master Oct 21, 2026
141 checks passed
@headius

headius commented Oct 21, 2026

Copy link
Copy Markdown
Member

This will make merging any CI changes from 10.0 pretty much impossible, but we aren't making many changes there anyway. If at some time we need to make changes we can backport this cleanup.

headius added a commit that referenced this pull request Oct 30, 2026
Adapt 6acff31 (#9866), retaining 10.0 setup-java/cache behavior, installed-JDK removal, and job ordering.
@sampokuokkanen
sampokuokkanen deleted the ci-workflow-dedup branch November 15, 2026 00:39
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