Skip to content

8385856: GHA: Consolidate architecture-specific steps in Windows CI workflows#31364

Open
gdams wants to merge 2 commits into
openjdk:masterfrom
gdams:win
Open

8385856: GHA: Consolidate architecture-specific steps in Windows CI workflows#31364
gdams wants to merge 2 commits into
openjdk:masterfrom
gdams:win

Conversation

@gdams
Copy link
Copy Markdown
Member

@gdams gdams commented Jun 3, 2026

Several steps in the Windows CI workflows are duplicated per architecture (x86.x64 / ARM64) where a single step with conditional expressions would suffice.

Changes:

  • action.yml: Merge the two MSYS2 install steps and two path steps into one of each, using expressions for release and location.
  • build-windows.yml: Merge the two toolchain check steps into one (conditional on bat file name), and merge the two toolchain install steps into one (component suffix already matches inputs.architecture).

This reduces duplication and makes future architecture additions simpler.



Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8385856: GHA: Consolidate architecture-specific steps in Windows CI workflows (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/31364/head:pull/31364
$ git checkout pull/31364

Update a local copy of the PR:
$ git checkout pull/31364
$ git pull https://git.openjdk.org/jdk.git pull/31364/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 31364

View PR using the GUI difftool:
$ git pr show -t 31364

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/31364.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Jun 3, 2026

👋 Welcome back gdams! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Jun 3, 2026

@gdams This change is no longer ready for integration - check the PR body for details.

@openjdk openjdk Bot added the build build-dev@openjdk.org label Jun 3, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Jun 3, 2026

@gdams The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk Bot added the rfr Pull request is ready for review label Jun 3, 2026
@mlbridge
Copy link
Copy Markdown

mlbridge Bot commented Jun 3, 2026

Webrevs

Copy link
Copy Markdown
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

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

Looks good, assuming the GHA run succeeds and show no issues.

@openjdk openjdk Bot added the ready Pull request is ready to be integrated label Jun 3, 2026
Copy link
Copy Markdown
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

One of the reasons why I asked @Luigi96 to have these steps split it to make X86 and AArch64 updates independent on each other. Things that I foresee can give us a headache going forward: msys2 versions, MSVC paths.

So unless we simplify in such a way those "platform-specific" things are selectable per job, we are good. But we are not there yet.

@gdams
Copy link
Copy Markdown
Member Author

gdams commented Jun 3, 2026

One of the reasons why I asked @Luigi96 to have these steps split it to make X86 and AArch64 updates independent on each other. Things that I foresee can give us a headache going forward: msys2 versions, MSVC paths.

So unless we simplify in such a way those "platform-specific" things are selectable per job, we are good. But we are not there yet.

I think we can use inputs here to still tidy up the code. Let me push another commit and see what you think

@gdams
Copy link
Copy Markdown
Member Author

gdams commented Jun 3, 2026

@shipilev let me know what you think now?

Note that it looks like there are some plans to include MSYS2 on the Windows ARM64 runners in the near future which would simplify this even further: actions/runner-images#14087

@openjdk openjdk Bot removed the ready Pull request is ready to be integrated label Jun 3, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants