Skip to content

Commit 5efa2eb

Browse files
committed
Remove unused GPG functions
The functions `setupKeys` and `refreshKeys` have not been used since the transition to Swiftly in swift-actions#710. So the changes in swift-actions#772 are meaningless.
1 parent 7e29321 commit 5efa2eb

File tree

4 files changed

+0
-184
lines changed

4 files changed

+0
-184
lines changed

__tests__/gpg.test.ts

Lines changed: 0 additions & 65 deletions
This file was deleted.

dist/index.js

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -107,65 +107,13 @@ var __importStar = (this && this.__importStar) || (function () {
107107
};
108108
})();
109109
Object.defineProperty(exports, "__esModule", ({ value: true }));
110-
exports.setupKeys = setupKeys;
111110
exports.verify = verify;
112-
exports.refreshKeys = refreshKeys;
113111
const exec_1 = __nccwpck_require__(5236);
114112
const core = __importStar(__nccwpck_require__(7484));
115-
const toolCache = __importStar(__nccwpck_require__(3472));
116-
async function setupKeys(os) {
117-
core.debug("Fetching verification keys");
118-
let path = await toolCache.downloadTool("https://swift.org/keys/all-keys.asc");
119-
if (os === "linux" || os === "darwin") {
120-
core.debug("Examining verification keys");
121-
await (0, exec_1.exec)(`file "${path}"`);
122-
const isPlaintext = await (0, exec_1.exec)(`gunzip --test "${path}"`, undefined, {
123-
silent: true,
124-
ignoreReturnCode: true,
125-
});
126-
core.debug("Importing verification keys");
127-
await (0, exec_1.exec)("bash", [
128-
"-c",
129-
`${isPlaintext ? "cat" : "zcat"} "${path}" | gpg --import`,
130-
]);
131-
}
132-
if (os === "win32") {
133-
core.debug("Importing verification keys");
134-
await (0, exec_1.exec)(`gpg --import "${path}"`);
135-
}
136-
core.debug("Refreshing keys");
137-
await refreshKeys();
138-
}
139113
async function verify(signaturePath, packagePath) {
140114
core.debug("Verifying signature");
141115
await (0, exec_1.exec)("gpg", ["--verify", signaturePath, packagePath]);
142116
}
143-
async function refreshKeys() {
144-
const pool = ["hkp://keyserver.ubuntu.com"];
145-
for (const server of pool) {
146-
core.debug(`Refreshing keys from ${server}`);
147-
// 1st try...
148-
if (await refreshKeysFromServer(server)) {
149-
core.debug(`Refresh successful on first attempt`);
150-
return;
151-
}
152-
// 2nd try...
153-
if (await refreshKeysFromServer(server)) {
154-
core.debug(`Refresh successful on second attempt`);
155-
return;
156-
}
157-
core.debug(`Refresh failed`);
158-
}
159-
throw new Error("Failed to refresh keys from any server in the pool.");
160-
}
161-
function refreshKeysFromServer(server) {
162-
return (0, exec_1.exec)(`gpg --keyserver ${server} --refresh-keys Swift`)
163-
.then((code) => code === 0)
164-
.catch((error) => {
165-
core.warning(`An error occurred when trying to refresh keys from ${server}: ${error}`);
166-
return false;
167-
});
168-
}
169117

170118

171119
/***/ }),

src/core/gpg.ts

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,7 @@
11
import { exec } from "@actions/exec";
22
import * as core from "@actions/core";
3-
import * as toolCache from "@actions/tool-cache";
4-
import { OS } from "./os";
5-
6-
export async function setupKeys(os: OS) {
7-
core.debug("Fetching verification keys");
8-
let path = await toolCache.downloadTool(
9-
"https://swift.org/keys/all-keys.asc",
10-
);
11-
12-
if (os === "linux" || os === "darwin") {
13-
core.debug("Examining verification keys");
14-
await exec(`file "${path}"`);
15-
const isPlaintext = await exec(`gunzip --test "${path}"`, undefined, {
16-
silent: true,
17-
ignoreReturnCode: true,
18-
});
19-
20-
core.debug("Importing verification keys");
21-
await exec("bash", [
22-
"-c",
23-
`${isPlaintext ? "cat" : "zcat"} "${path}" | gpg --import`,
24-
]);
25-
}
26-
27-
if (os === "win32") {
28-
core.debug("Importing verification keys");
29-
await exec(`gpg --import "${path}"`);
30-
}
31-
32-
core.debug("Refreshing keys");
33-
await refreshKeys();
34-
}
353

364
export async function verify(signaturePath: string, packagePath: string) {
375
core.debug("Verifying signature");
386
await exec("gpg", ["--verify", signaturePath, packagePath]);
397
}
40-
41-
export async function refreshKeys() {
42-
const pool = ["hkp://keyserver.ubuntu.com"];
43-
44-
for (const server of pool) {
45-
core.debug(`Refreshing keys from ${server}`);
46-
// 1st try...
47-
if (await refreshKeysFromServer(server)) {
48-
core.debug(`Refresh successful on first attempt`);
49-
return;
50-
}
51-
52-
// 2nd try...
53-
if (await refreshKeysFromServer(server)) {
54-
core.debug(`Refresh successful on second attempt`);
55-
return;
56-
}
57-
core.debug(`Refresh failed`);
58-
}
59-
60-
throw new Error("Failed to refresh keys from any server in the pool.");
61-
}
62-
63-
function refreshKeysFromServer(server: string): Promise<boolean> {
64-
return exec(`gpg --keyserver ${server} --refresh-keys Swift`)
65-
.then((code) => code === 0)
66-
.catch((error) => {
67-
core.warning(
68-
`An error occurred when trying to refresh keys from ${server}: ${error}`,
69-
);
70-
return false;
71-
});
72-
}

src/core/os.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@ export async function getOS() {
99

1010
return detectedSystem.os;
1111
}
12-
13-
export type OS = getos.Os["os"];

0 commit comments

Comments
 (0)