Patch release (#1951)

* Allow doing a patch release

* Turn off Windows 6.2

Author: award999

.github/workflows/nightly.yml

@@ -7,6 +7,11 @@ on:
   schedule:
     - cron: "0 0 * * *"
   workflow_dispatch:
+    inputs:
+      patchRelease:
+        description: 'Make a patch release'
+        required: false
+        type: boolean
 
 jobs:
   package:
@@ -27,7 +32,12 @@ jobs:
           . .github/workflows/scripts/setup-linux.sh
           [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
           npm ci
-          npm run package
+          if [ "${{github.event.inputs.patchRelease}}" = "true" ]; then
+            echo "Making patch release\n"
+            npm run patch-package
+          else
+            npm run package
+          fi
           npm run preview-package
           for file in *.vsix; do
             name="$(basename "$file" .vsix)-${{github.run_number}}.vsix"
@@ -65,7 +75,7 @@ jobs:
       linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
       linux_build_command: ./scripts/test.sh
       # Windows
-      windows_exclude_swift_versions: '[{"swift_version": "nightly-6.1"},{"swift_version": "nightly"}]'  # Missing https://github.com/swiftlang/swift/pull/80144
+      windows_exclude_swift_versions: '[{"swift_version": "nightly-6.1"}, {"swift_version": "nightly"},  {"swift_version": "6.2"}]'  # Missing https://github.com/swiftlang/swift/pull/80144
       windows_env_vars: |
         CI=1
         VSCODE_SWIFT_VSIX_ID=${{needs.package.outputs.artifact-id}}
@@ -94,7 +104,7 @@ jobs:
       linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
       linux_build_command: ./scripts/test.sh
       # Windows
-      windows_exclude_swift_versions: '[{"swift_version": "5.9"}, {"swift_version": "6.0"}, {"swift_version": "6.1"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-6.2"}, {"swift_version": "nightly"}]'
+      windows_exclude_swift_versions: '[{"swift_version": "5.9"}, {"swift_version": "6.0"}, {"swift_version": "6.1"}, {"swift_version": "6.2"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-6.2"}, {"swift_version": "nightly"}]'
       windows_env_vars: |
         CI=1
         VSCODE_VERSION=insiders

package.json

@@ -2048,6 +2048,7 @@
     "package": "tsx ./scripts/package.ts",
     "dev-package": "tsx ./scripts/dev_package.ts",
     "preview-package": "tsx ./scripts/preview_package.ts",
+    "patch-package": "tsx ./scripts/patch_package.ts",
     "tag": "./scripts/tag_release.sh $npm_package_version",
     "contributors": "./scripts/generate_contributors_list.sh",
     "prepare": "husky"

scripts/lib/utilities.ts

@@ -80,7 +80,7 @@ export async function exec(
     command: string,
     args: string[],
     options: child_process.SpawnOptionsWithoutStdio = {}
-): Promise<void> {
+): Promise<string> {
     let logMessage = "> " + command;
     if (args.length > 0) {
         logMessage += " " + args.join(" ");
@@ -93,7 +93,8 @@ export async function exec(
         command = command + ".cmd";
         options.shell = true;
     }
-    return new Promise<void>((resolve, reject) => {
+    let output = "";
+    return new Promise<string>((resolve, reject) => {
         const childProcess = child_process.spawn(command, args, { stdio: "inherit", ...options });
         childProcess.once("error", reject);
         childProcess.once("close", (code, signal) => {
@@ -102,10 +103,13 @@ export async function exec(
             } else if (code !== 0) {
                 reject(new Error(`Process exited with code ${code}`));
             } else {
-                resolve();
+                resolve(output);
             }
             console.log("");
         });
+        childProcess.stdout?.on("data", buf => {
+            output += buf.toString("utf-8");
+        });
     });
 }
 
@@ -187,3 +191,13 @@ export async function packageExtension(version: string, options: PackageExtensio
         console.error(error);
     });
 }
+
+export async function releasedVersions(extensionId: string): Promise<string[]> {
+    const output = await exec("npx", ["vsce", "show", extensionId, "--json"], {
+        stdio: "pipe",
+        cwd: getRootDirectory(),
+    });
+
+    const extensionInfo = JSON.parse(output.trim());
+    return extensionInfo.versions.map((v: { version: string }) => v.version);
+}

scripts/patch_package.ts

@@ -0,0 +1,40 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the VS Code Swift open source project
+//
+// Copyright (c) 2025 the VS Code Swift project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of VS Code Swift project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+/* eslint-disable no-console */
+import { getExtensionVersion, main, packageExtension, releasedVersions } from "./lib/utilities";
+
+import "@vscode/vsce";
+
+main(async () => {
+    const releases = await releasedVersions("swiftlang.swift-vscode");
+    const version = await getExtensionVersion();
+    // Decrement the minor version and set a patch
+    const minor = version.minor - 2;
+    let patch = 1;
+    let previewVersion = "";
+    while (
+        (previewVersion = `${version.major}.${minor}.${patch}`) &&
+        releases.includes(previewVersion)
+    ) {
+        patch += 1;
+    }
+    // Make sure that the new minor version is odd
+    if (minor % 2 !== 0) {
+        throw new Error(
+            `The minor version for the patch release extension is odd (${previewVersion}).` +
+                " The version in the package.json has probably been incorrectly set to an even minor version."
+        );
+    }
+    await packageExtension(previewVersion);
+});