Skip to content

Commit 09cbc38

Browse files
committed
Preserve the emergency-fix exception for the frozen maintenance branch
Signed-off-by: Ralf W. Grosse-Kunstleve <rgrossekunst@nvidia.com>
1 parent 3fc6afd commit 09cbc38

4 files changed

Lines changed: 17 additions & 11 deletions

File tree

‎.github/RELEASE-bindings.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ must continue while development advances, create a short release branch such
2424
as `release/bindings-12.9.11` from the chosen commit. For an emergency after a
2525
release, start from its exact tag, provided that tag contains the new package
2626
layout. For the first release after this transition, use a validated commit
27-
containing both roots; do not resume development on the historical `12.9.x`
28-
branch. Keep the package layout and release tooling together on the branch.
27+
containing both roots. Keep routine development on `main`; the historical
28+
`12.9.x` branch stays frozen except for emergency fixes using compatible
29+
historical tooling. Reconcile those fixes into the main-tree maintenance
30+
root. Keep the package layout and release tooling together on new release branches.
2931

3032
Record the source commit, intended tag, selected package root, release owner,
3133
and accepted changes in the release checklist. A branch is a temporary scope

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,9 @@ through the [CI tools](ci/README.md).
394394
`main` integrates changes for both supported majors. Short release branches
395395
can stabilize a selected release or carry urgent fixes while development
396396
continues. Return applicable fixes to `main` and assess both source roots.
397-
The historical `12.9.x` branch is retained for diagnosis of old releases;
398-
new main CI and releases do not fetch package artifacts from that branch.
397+
The historical `12.9.x` branch stays frozen except for emergency fixes,
398+
which must be reconciled into `main`. New main CI and releases do not fetch
399+
package artifacts from that branch.
399400

400401
The [bindings release guide](.github/RELEASE-bindings.md) covers release scope,
401402
manual backport automation, source and control revisions, and validation.

‎ci/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,9 +295,10 @@ python -m ci.tools.bindings_config --check-package-metadata
295295
## Maintaining Both Bindings Roots
296296

297297
`main` is the integration branch for both bindings release lines. The old
298-
`12.9.x` branch remains available as a record of earlier releases; develop
299-
new CUDA 12 changes in `cuda_bindings_12/` on `main`. Short release branches
300-
may stabilize a selected version or carry urgent fixes while `main` advances.
298+
`12.9.x` branch stays frozen except for emergency fixes using compatible
299+
historical tooling; reconcile any such fix into `cuda_bindings_12/` on `main`.
300+
Routine CUDA 12 development belongs in that main-tree root. Short release
301+
branches may stabilize a selected version or carry urgent fixes while `main` advances.
301302
The [bindings release guide](../.github/RELEASE-bindings.md) describes branch
302303
creation, backport automation, independent release validation, and returning
303304
fixes to `main`. The

‎cuda_bindings_12/MAINTENANCE.md‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ SPDX-License-Identifier: Apache-2.0
99
CUDA 13 bindings live in `cuda_bindings_13/`. The package roots and their release
1010
statuses are configured in [`ci/versions.yml`](../ci/versions.yml).
1111

12-
Integrate both release lines on `main`. The former `12.9.x` branch is a record
13-
of past releases; new CUDA 12 fixes, tests, and documentation belong in
14-
`cuda_bindings_12/`. Short release branches may stabilize a release or carry
15-
an urgent fix; return such fixes to `main` and assess the CUDA 13 root too.
12+
Integrate both release lines on `main`. The former `12.9.x` branch stays
13+
frozen except for emergency fixes using compatible historical tooling;
14+
reconcile those fixes into `cuda_bindings_12/`. Routine CUDA 12 fixes, tests,
15+
and documentation belong in this main-tree root. Short release branches may
16+
stabilize a release or carry an urgent fix; reconcile such fixes into `main`
17+
and assess the CUDA 13 root too.
1618

1719
Follow the [bindings release guide](../.github/RELEASE-bindings.md) for branch
1820
selection, patch-release scope, backports, and release validation.

0 commit comments

Comments
 (0)