Signature file seems to not be used for windows

swift-actions · Jul 3, 2024 · 7a4bf15 · 7a4bf15
1 parent dc3d8ce
commit 7a4bf15
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/gpg.ts b/src/gpg.ts
@@ -15,9 +15,9 @@ export async function setupKeys() {
   await refreshKeys();
 }
 
-export async function verify(signaturePath: string, packagePath: string) {
+export async function verify(...paths: string[]) {
   core.debug("Verifying signature");
-  await exec("gpg", ["--verify", signaturePath, packagePath]);
+  await exec("gpg", ["--verify", ...paths]);
 }
 
 export async function refreshKeys() {

diff --git a/src/linux-install.ts b/src/linux-install.ts
@@ -23,7 +23,7 @@ export async function install(version: string, system: System) {
     const swiftPkg = swiftPackage(version, system);
     let { pkg, signature } = await download(swiftPkg);
 
-    await verify(signature, pkg);
+    await verify(pkg, signature);
 
     swiftPath = await unpack(pkg, swiftPkg.name, version, system);
   } else {

diff --git a/src/windows-install.ts b/src/windows-install.ts
@@ -23,8 +23,8 @@ export async function install(version: string, system: System) {
 
     await setupKeys();
 
-    let { exe, signature } = await download(swiftPkg);
-    await verify(signature, exe);
+    let { exe } = await download(swiftPkg);
+    await verify(exe);
 
     const exePath = await toolCache.cacheFile(
       exe,
@@ -80,11 +80,11 @@ export async function install(version: string, system: System) {
 async function download({ url, name }: Package) {
   core.debug("Downloading Swift for windows");
 
-  let [exe, signature] = await Promise.all([
+  let [exe] = await Promise.all([
     toolCache.downloadTool(url),
     toolCache.downloadTool(`${url}.sig`),
   ]);
 
   core.debug("Swift download complete");
-  return { exe, signature, name };
+  return { exe, name };
 }