Skip to content

Add ucrt64 support for minimal, makepkg-git, and build-installers flavors#1362

Merged
dscho merged 5 commits into
mainfrom
ucrt64-subset-flavors
Jun 16, 2026
Merged

Add ucrt64 support for minimal, makepkg-git, and build-installers flavors#1362
dscho merged 5 commits into
mainfrom
ucrt64-subset-flavors

Conversation

@dscho

@dscho dscho commented Jun 8, 2026

Copy link
Copy Markdown
Member

Follow-up to #1361, which added the ucrt64 axis but only for flavor: full. This PR extends that to the minimal, makepkg-git, and build-installers flavors so the ucrt64 axis is on equal footing with the others.

The Action itself doesn't need new source code for this; it just needed please.sh create-sdk-artifact --architecture=ucrt64 to be a working invocation, which is what git-for-windows/build-extra#710 adds. So the diff here is documentation hygiene (removing the "only full for now" caveats) and matrix extensions (so the new combinations are exercised both on every PR and in the manual all-flavors run). The CI-artifacts fast path stays suppressed for ucrt64 until upstream grows a UCRT64 asset; that is a separate concern.

dscho added 4 commits June 8, 2026 20:51
When the `ucrt64` axis first landed, only `flavor: full` worked: the
subset flavors call out to `please.sh create-sdk-artifact` in
`build-extra`, and that script did not understand
`--architecture=ucrt64` at the time. That has since been fixed, so
all four flavors work for `ucrt64`.

Drop the now-stale "only the `full` flavor is supported" sentence
from the action description.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Match the action.yml change of the previous commit: with
`please.sh create-sdk-artifact --architecture=ucrt64` now a working
invocation, all four flavors are viable on the `ucrt64` axis.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Match the preceding action.yml and README updates. With
`please.sh create-sdk-artifact --architecture=ucrt64` now a working
invocation, all four flavors take the `getViaGit` path successfully
on the `ucrt64` axis, so the table cell and the explanatory
paragraph no longer need to single `full` out.

The ci-artifacts fast path remains suppressed for `ucrt64` because
the `ci-artifacts` release of `git-sdk-64` still carries no UCRT64
asset; reword the paragraph to spell out what that means in practice
(every flavor goes through `please.sh`).

The table-column realignment is a no-op produced by `npm run format`
since the longest cell in the notes column shrank.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The per-PR `test` matrix already covered `ucrt64` + `full` end-to-end.
Now that `please.sh create-sdk-artifact --architecture=ucrt64` works,
extend the matrix with the three subset flavors so a regression on
the `getViaGit` -> `please.sh` path for `ucrt64` is caught on every
PR rather than first surfacing in a consumer repository.

`mingw_prefix` stays at `/ucrt64` for all three new rows; the
verification step's `$MINGW_PREFIX/bin/gcc` assertion checks the
same path on every flavor, since `gcc` is present in `minimal`,
`makepkg-git`, `build-installers`, and `full` alike.

Also drop the now-stale comment explaining why `ucrt64` only had a
`full` row.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the ucrt64-subset-flavors branch from 0af9fda to ba0ca61 Compare June 10, 2026 12:15
The manually-triggered `test all artifact flavors` matrix already
covers every flavor on `i686` and `x86_64`. Add `ucrt64` as a third
value in the `architecture` array so the same four flavors get
spawned against it too, replacing the previous one-row `include`
block (which was added when only `flavor: full` worked for `ucrt64`)
and dropping the now-stale comment that justified that asymmetry.

Assisted-by: Opus 4.7
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the ucrt64-subset-flavors branch from ba0ca61 to 55a803a Compare June 10, 2026 14:49
@dscho dscho marked this pull request as ready for review June 10, 2026 18:36
@dscho dscho changed the base branch from ucrt64 to main June 11, 2026 10:00
@dscho

dscho commented Jun 16, 2026

Copy link
Copy Markdown
Member Author

Closing and reopening to make up for GitHub missing that part of this branch has already been merged.

@dscho dscho closed this Jun 16, 2026
@dscho dscho reopened this Jun 16, 2026
@dscho dscho merged commit ac48f45 into main Jun 16, 2026
12 checks passed
@dscho dscho deleted the ucrt64-subset-flavors branch June 16, 2026 12:42
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.

1 participant