8385856: GHA: Consolidate architecture-specific steps in Windows CI workflows#31364
8385856: GHA: Consolidate architecture-specific steps in Windows CI workflows#31364gdams wants to merge 2 commits into
Conversation
|
👋 Welcome back gdams! A progress list of the required criteria for merging this PR into |
|
@gdams This change is no longer ready for integration - check the PR body for details. |
Webrevs
|
RealCLanger
left a comment
There was a problem hiding this comment.
Looks good, assuming the GHA run succeeds and show no issues.
shipilev
left a comment
There was a problem hiding this comment.
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 |
|
@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 |
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 matchesinputs.architecture).This reduces duplication and makes future architecture additions simpler.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/31364/head:pull/31364$ git checkout pull/31364Update a local copy of the PR:
$ git checkout pull/31364$ git pull https://git.openjdk.org/jdk.git pull/31364/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 31364View PR using the GUI difftool:
$ git pr show -t 31364Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/31364.diff
Using Webrev
Link to Webrev Comment