Skip to content

Forward-merge release/26.10 into main - #775

Merged
rapids-bot[bot] merged 1 commit into
mainfrom
release/26.10
Sep 10, 2026
Merged

rapids-bot[bot] merged 1 commit into
mainfrom
release/26.10

Conversation

@rapids-bot

@rapids-bot rapids-bot Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

Forward-merge triggered by push to release/26.10 that creates a PR to keep main up-to-date. If this PR is unable to be immediately merged due to conflicts, it will remain open for the team to manually merge. See forward-merger docs for more info.

**Posted by Codex (GPT-5) on Michael Sarahan's behalf. Treat this
message as LLM-generated.**

## Why

The 26.12 version update triggered the release workflow before
`v26.12.00a` existed. Image producers derive their namespace from the
most recent reachable tag, so they published successful `26.10-*` images
while the newly updated unified devcontainers requested `26.12-*`
images. The alpha tag appeared nine minutes after the workflow began. A
later retry of failed jobs could not recover because GitHub did not
rerun the already-successful producer jobs.

This creates an avoidable bootstrap dependency: the version-update
workflow needs to publish the new namespace before the tag that
currently defines that namespace can be created. The committed `VERSION`
file is already updated atomically with the consumer definitions and is
therefore the appropriate source of truth for producer tags.

The incident also exposed a second class of mismatch: `matrix.yml` can
change an image component version without the checked-in unified
devcontainers changing their `BASE` references. Without validation, that
drift is only discovered after all producer builds complete and
consumers attempt to pull an image that will never be published.

PR #766 applies the UCX alignment to `release/26.10` for
forward-merging. This branch currently contains the equivalent
main-branch alignment; that portion will disappear from this PR's diff
after the forward merge reaches `main`.

## Changes

- derive Linux and Windows producer namespaces from the committed
`VERSION` file instead of `git describe`
- validate that `VERSION` uses `YY.MM.PP` format
- reconstruct all publishable Linux image tags from `matrix.yml`,
including OS-qualified tags and OS-free aliases
- reject any checked-in RAPIDS unified devcontainer `BASE` that the
current matrix cannot produce
- run that validation in pre-commit and as a fatal release prerequisite
before Linux producers and downstream unified devcontainers run
- add ShellCheck coverage for the release-bootstrap scripts touched here

## Why the previous sequence cannot recur

After these changes, merging a version update changes both producer and
consumer namespaces through the same committed `VERSION` value. The
producer no longer depends on whether the alpha tag existed when the
workflow checkout occurred. The release also stops before building
images if a consumer base does not correspond to the current matrix, so
component-version drift is reported directly rather than surfacing as a
late missing-manifest error.

## Validation

- `pre-commit run --all-files`
  - zizmor
  - devcontainer base-image validation
  - ShellCheck for the release-bootstrap scripts
- positive validation against the 26.12 / UCX 1.21 configuration
- negative validation with a deliberate UCX 1.19 base, which failed and
identified the affected file and unproducible tag
- `git diff --check`

Incident:
https://github.com/rapidsai/devcontainers/actions/runs/34280170418/job/102279620120

---------

Co-authored-by: Paul Taylor <178183+trxcllnt@users.noreply.github.com>
@rapids-bot
rapids-bot Bot requested a review from a team as a code owner September 10, 2026 17:58
@rapids-bot
rapids-bot Bot requested review from msarahan and removed request for a team September 10, 2026 17:58
@rapids-bot

rapids-bot Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor Author

FAILURE - Unable to forward-merge due to an error, manual merge is necessary. Do not use the Resolve conflicts option in this PR, follow these instructions https://docs.rapids.ai/maintainers/forward-merger/

IMPORTANT: When merging this PR, do not use the auto-merger (i.e. the /merge comment). Instead, an admin must manually merge by changing the merging strategy to Create a Merge Commit. Otherwise, history will be lost and the branches become incompatible.

rapids-bot Bot added a commit that referenced this pull request Sep 10, 2026
Forward-merge release/26.10 into main (replacement for #775)
@rapids-bot
rapids-bot Bot merged commit 4b90875 into main Sep 10, 2026
1 check passed
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