Merge branch 'main' into next

# Conflicts:
#	.github/workflows/ci.yml
#	package-lock.json
#	src/linux-install.ts
#	src/swift-versions.ts
#	src/windows-install.ts

Author: fwal

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, ubuntu-24.04-arm, macos-latest]
-        swift: ["6.1"]
+        swift: ["6.2"]
     steps:
       - uses: actions/checkout@v4
       - name: Setup Node

.github/workflows/stability.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        swift: ["5.10"]
+        swift: ["6.2"]
     steps:
       - uses: swift-actions/setup-swift@v2
         with:
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        swift: ["5.10"]
+        swift: ["6.2"]
     steps:
       - uses: swift-actions/setup-swift@main
         with:

README.md

@@ -8,7 +8,7 @@
     <img src="https://img.shields.io/badge/platform-macOS%20%7C%20Ubuntu%20%7C%20Windows-lightgray" alt="Supports macOS, Ubuntu & Windows" />
   </a>
   <a href="https://swift.org">
-    <img src="https://img.shields.io/badge/Swift-6.0.2-F05138?logo=swift&logoColor=white" alt="Swift 6.1.0" />
+    <img src="https://img.shields.io/badge/Swift-6.2-F05138?logo=swift&logoColor=white" alt="Swift 6.2" />
   </a>
   <a href="https://github.com/swift-actions/setup-swift/releases/latest">
     <img src="https://img.shields.io/github/v/release/swift-actions/setup-swift?sort=semver" alt="Latest release" />
@@ -20,6 +20,7 @@
 > [!IMPORTANT]
 > 3.0 is coming, powered by Swiftly 🚀 - follow progress on https://github.com/swift-actions/setup-swift/pull/710
 
+
 ## Usage
 
 To run the action with the latest swift version available, simply add the action as a step in your workflow:
@@ -33,7 +34,7 @@ After the environment is configured you can run swift commands using the standar
 ```yaml
 - uses: swift-actions/setup-swift@v2
 - name: Get swift version
-  run: swift --version # Swift 6.1.0
+  run: swift --version # Swift 6.2
 ```
 
 A specific Swift version can be set using the `swift-version` input:

dist/index.js

@@ -76,11 +76,27 @@ exports.refreshKeys = exports.verify = exports.setupKeys = void 0;
 const exec_1 = __nccwpck_require__(1514);
 const core = __importStar(__nccwpck_require__(2186));
 const toolCache = __importStar(__nccwpck_require__(7784));
-async function setupKeys() {
+const os_1 = __nccwpck_require__(1855);
+async function setupKeys(system) {
     core.debug("Fetching verification keys");
     let path = await toolCache.downloadTool("https://swift.org/keys/all-keys.asc");
-    core.debug("Importing verification keys");
-    await (0, exec_1.exec)(`gpg --import "${path}"`);
+    if (system.os === os_1.OS.Ubuntu || system.os === os_1.OS.MacOS) {
+        core.debug("Examining verification keys");
+        await (0, exec_1.exec)(`file "${path}"`);
+        const isPlaintext = await (0, exec_1.exec)(`gunzip --test "${path}"`, undefined, {
+            silent: true,
+            ignoreReturnCode: true,
+        });
+        core.debug("Importing verification keys");
+        await (0, exec_1.exec)("bash", [
+            "-c",
+            `${isPlaintext ? "cat" : "zcat"} "${path}" | gpg --import`,
+        ]);
+    }
+    if (system.os === os_1.OS.Windows) {
+        core.debug("Importing verification keys");
+        await (0, exec_1.exec)(`gpg --import "${path}"`);
+    }
     core.debug("Refreshing keys");
     await refreshKeys();
 }
@@ -165,7 +181,7 @@ async function install(version, system) {
     let swiftPath = toolCache.find(`swift-${system.name}`, version);
     if (swiftPath === null || swiftPath.trim().length == 0) {
         core.debug(`No matching installation found`);
-        await (0, gpg_1.setupKeys)();
+        await (0, gpg_1.setupKeys)(system);
         const swiftPkg = (0, swift_versions_1.swiftPackage)(version, system);
         let { pkg, signature } = await download(swiftPkg);
         await (0, gpg_1.verify)(signature, pkg);
@@ -460,7 +476,12 @@ const semver = __importStar(__nccwpck_require__(1383));
 const core = __importStar(__nccwpck_require__(2186));
 const os_1 = __nccwpck_require__(1855);
 const VERSIONS_LIST = [
-    ["6.1.0", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
+    ["6.2.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
+    ["6.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
+    ["6.1.3", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
+    ["6.1.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
+    ["6.1.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
+    ["6.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
     ["6.0.3", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
     ["6.0.2", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
     ["6.0.1", [os_1.OS.MacOS, os_1.OS.Ubuntu]],
@@ -790,7 +811,7 @@ const toolCache = __importStar(__nccwpck_require__(7784));
 const path = __importStar(__nccwpck_require__(1017));
 const exec_1 = __nccwpck_require__(1514);
 const swift_versions_1 = __nccwpck_require__(8263);
-const gpg_1 = __nccwpck_require__(9060);
+//import { setupKeys, verify } from "./gpg";
 const visual_studio_1 = __nccwpck_require__(5219);
 async function install(version, system) {
     if (os.platform() !== "win32") {
@@ -801,9 +822,9 @@ async function install(version, system) {
     let swiftPath = toolCache.find(`swift-${system.name}`, version);
     if (swiftPath === null || swiftPath.trim().length == 0) {
         core.debug(`No cached installer found`);
-        await (0, gpg_1.setupKeys)();
+        //await setupKeys(system);
         let { exe, signature } = await download(swiftPkg);
-        await (0, gpg_1.verify)(signature, exe);
+        //await verify(signature, exe);
         const exePath = await toolCache.cacheFile(exe, swiftPkg.name, `swift-${system.name}`, version);
         swiftPath = path.join(exePath, swiftPkg.name);
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-swift",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Set up GitHub Actions workflow with Swift support",
   "private": true,
   "main": "lib/main.js",

package.json

@@ -1,15 +1,33 @@
 import { exec } from "@actions/exec";
 import * as core from "@actions/core";
 import * as toolCache from "@actions/tool-cache";
+import { OS, System } from "./os";
 
-export async function setupKeys() {
+export async function setupKeys(system: System) {
   core.debug("Fetching verification keys");
   let path = await toolCache.downloadTool(
     "https://swift.org/keys/all-keys.asc",
   );
 
-  core.debug("Importing verification keys");
-  await exec(`gpg --import "${path}"`);
+  if (system.os === OS.Ubuntu || system.os === OS.MacOS) {
+    core.debug("Examining verification keys");
+    await exec(`file "${path}"`);
+    const isPlaintext = await exec(`gunzip --test "${path}"`, undefined, {
+      silent: true,
+      ignoreReturnCode: true,
+    });
+
+    core.debug("Importing verification keys");
+    await exec("bash", [
+      "-c",
+      `${isPlaintext ? "cat" : "zcat"} "${path}" | gpg --import`,
+    ]);
+  }
+
+  if (system.os === OS.Windows) {
+    core.debug("Importing verification keys");
+    await exec(`gpg --import "${path}"`);
+  }
 
   core.debug("Refreshing keys");
   await refreshKeys();