Merge pull request #58 from DeterminateSystems/stable-detector

nixpkgs stable detector: handle the new `branch-off-` tag prefix
DeterminateSystems · Nov 30, 2024 · c3e2fd4 · c3e2fd4
2 parents 977f22f + 315faf1
commit c3e2fd4
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 2 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -76067,6 +76067,34 @@ var OUTPUT_KEY = "minorVersion";
 var BRANCH_REGEX = new RegExp(
   /^nixos-(?<version>([0-9]+\.[0-9]+)|unstable)$/
 );
+var STABLE_TAG_NAME_REFS = {
+  "15.09": "tags/15.09",
+  "16.03": "tags/16.03",
+  "16.09": "tags/16.09",
+  "17.03": "tags/17.03",
+  "17.09": "tags/17.09",
+  "18.03": "tags/18.03",
+  "18.09": "tags/18.09",
+  "19.03": "tags/19.03",
+  "19.09": "tags/19.09",
+  "20.03": "tags/20.03",
+  "20.09": "tags/20.09",
+  "21.05": "tags/21.05",
+  "21.11": "tags/21.11",
+  "22.05": "tags/22.05",
+  "22.11": "tags/22.11",
+  "23.05": "tags/23.05",
+  "23.11": "tags/23.11",
+  "24.05": "tags/24.05",
+  // Release wiki process changed to create a `branch-off-yy.mm` tag at time of final release.
+  //
+  // Note:
+  // `yy.mm-beta` is the tag created at the start of preparing the release, where it branches off from master.
+  // `branch-off-yy.mm` is a surprising name, but is the pattern identified in the documentation.
+  //
+  // See: https://github.com/NixOS/release-wiki/pull/90
+  "24.11": "tags/branch-off-24.11"
+};
 var FlakeHubMirrorAction = class {
   constructor() {
     this.releaseBranch = detsys_ts__WEBPACK_IMPORTED_MODULE_0__/* .inputs */ .QL.getString("release-branch");
@@ -76099,7 +76127,12 @@ async function getRollingMinor(branch, testMode = false) {
           );
         }
         const octokit = _actions_github__WEBPACK_IMPORTED_MODULE_2__.getOctokit(githubToken);
-        const expectedRef = `tags/${versionPart}`;
+        let expectedRef;
+        if (STABLE_TAG_NAME_REFS[versionPart]) {
+          expectedRef = STABLE_TAG_NAME_REFS[versionPart];
+        } else {
+          expectedRef = `tags/branch-off-${versionPart}`;
+        }
         try {
           await octokit.rest.git.getRef({
             owner: "NixOS",

diff --git a/src/index.ts b/src/index.ts
@@ -8,6 +8,36 @@ const BRANCH_REGEX = new RegExp(
   /^nixos-(?<version>([0-9]+\.[0-9]+)|unstable)$/,
 );
 
+const STABLE_TAG_NAME_REFS: { [key: string]: string } = {
+  "15.09": "tags/15.09",
+  "16.03": "tags/16.03",
+  "16.09": "tags/16.09",
+  "17.03": "tags/17.03",
+  "17.09": "tags/17.09",
+  "18.03": "tags/18.03",
+  "18.09": "tags/18.09",
+  "19.03": "tags/19.03",
+  "19.09": "tags/19.09",
+  "20.03": "tags/20.03",
+  "20.09": "tags/20.09",
+  "21.05": "tags/21.05",
+  "21.11": "tags/21.11",
+  "22.05": "tags/22.05",
+  "22.11": "tags/22.11",
+  "23.05": "tags/23.05",
+  "23.11": "tags/23.11",
+  "24.05": "tags/24.05",
+
+  // Release wiki process changed to create a `branch-off-yy.mm` tag at time of final release.
+  //
+  // Note:
+  // `yy.mm-beta` is the tag created at the start of preparing the release, where it branches off from master.
+  // `branch-off-yy.mm` is a surprising name, but is the pattern identified in the documentation.
+  //
+  // See: https://github.com/NixOS/release-wiki/pull/90
+  "24.11": "tags/branch-off-24.11",
+};
+
 class FlakeHubMirrorAction {
   private releaseBranch: string;
 
@@ -54,7 +84,13 @@ export async function getRollingMinor(
 
         const octokit = github.getOctokit(githubToken);
 
-        const expectedRef = `tags/${versionPart}`;
+        let expectedRef: string;
+        if (STABLE_TAG_NAME_REFS[versionPart]) {
+          expectedRef = STABLE_TAG_NAME_REFS[versionPart];
+        } else {
+          // See: https://github.com/NixOS/release-wiki/pull/90
+          expectedRef = `tags/branch-off-${versionPart}`;
+        }
 
         // Check that NixOS/nixpkgs has the tag `${versionPart}`, like a tag named `24.05` for the nixos-24.05 branch.
         try {