diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index cfa2fb813..996b85052 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -65731,25 +65731,28 @@ const fs = __importStar(__nccwpck_require__(7147)); const path = __importStar(__nccwpck_require__(1017)); const io = __importStar(__nccwpck_require__(7436)); const exec = __importStar(__nccwpck_require__(1514)); +const core = __importStar(__nccwpck_require__(2186)); const util = __importStar(__nccwpck_require__(2629)); exports.PRIVATE_KEY_FILE = path.join(util.getTempDir(), 'private-key.asc'); -const PRIVATE_KEY_FINGERPRINT_REGEX = /\w{40}/; +const PRIVATE_KEY_FINGERPRINT_REGEX = /\w{8,40}/; function importKey(privateKey) { return __awaiter(this, void 0, void 0, function* () { fs.writeFileSync(exports.PRIVATE_KEY_FILE, privateKey, { encoding: 'utf-8', flag: 'w' }); + core.info(`PRIVATE_KEY_FILE: ${exports.PRIVATE_KEY_FILE}`); + const lines = privateKey.split(/\r\n|\r|\n/).length; + core.info(`Private key contains ${lines} lines`); let output = ''; const options = { - silent: true, listeners: { stdout: (data) => { output += data.toString(); } } }; - yield exec.exec('gpg', ['--batch', '--import-options', 'import-show', '--import', exports.PRIVATE_KEY_FILE], options); + yield exec.exec('gpg', ['--batch', '--verbose', '--import', exports.PRIVATE_KEY_FILE], options); yield io.rmRF(exports.PRIVATE_KEY_FILE); const match = output.match(PRIVATE_KEY_FINGERPRINT_REGEX); return match && match[0]; diff --git a/dist/setup/index.js b/dist/setup/index.js index f2a2170f5..0942bc0f1 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -102139,25 +102139,28 @@ const fs = __importStar(__nccwpck_require__(7147)); const path = __importStar(__nccwpck_require__(1017)); const io = __importStar(__nccwpck_require__(7436)); const exec = __importStar(__nccwpck_require__(1514)); +const core = __importStar(__nccwpck_require__(2186)); const util = __importStar(__nccwpck_require__(2629)); exports.PRIVATE_KEY_FILE = path.join(util.getTempDir(), 'private-key.asc'); -const PRIVATE_KEY_FINGERPRINT_REGEX = /\w{40}/; +const PRIVATE_KEY_FINGERPRINT_REGEX = /\w{8,40}/; function importKey(privateKey) { return __awaiter(this, void 0, void 0, function* () { fs.writeFileSync(exports.PRIVATE_KEY_FILE, privateKey, { encoding: 'utf-8', flag: 'w' }); + core.info(`PRIVATE_KEY_FILE: ${exports.PRIVATE_KEY_FILE}`); + const lines = privateKey.split(/\r\n|\r|\n/).length; + core.info(`Private key contains ${lines} lines`); let output = ''; const options = { - silent: true, listeners: { stdout: (data) => { output += data.toString(); } } }; - yield exec.exec('gpg', ['--batch', '--import-options', 'import-show', '--import', exports.PRIVATE_KEY_FILE], options); + yield exec.exec('gpg', ['--batch', '--verbose', '--import', exports.PRIVATE_KEY_FILE], options); yield io.rmRF(exports.PRIVATE_KEY_FILE); const match = output.match(PRIVATE_KEY_FINGERPRINT_REGEX); return match && match[0]; diff --git a/src/gpg.ts b/src/gpg.ts index 82fd22ffe..958d1a12d 100644 --- a/src/gpg.ts +++ b/src/gpg.ts @@ -2,12 +2,13 @@ import * as fs from 'fs'; import * as path from 'path'; import * as io from '@actions/io'; import * as exec from '@actions/exec'; +import * as core from '@actions/core'; import * as util from './util'; import { ExecOptions } from '@actions/exec/lib/interfaces'; export const PRIVATE_KEY_FILE = path.join(util.getTempDir(), 'private-key.asc'); -const PRIVATE_KEY_FINGERPRINT_REGEX = /\w{40}/; +const PRIVATE_KEY_FINGERPRINT_REGEX = /\w{8,40}/; export async function importKey(privateKey: string) { fs.writeFileSync(PRIVATE_KEY_FILE, privateKey, { @@ -15,10 +16,13 @@ export async function importKey(privateKey: string) { flag: 'w' }); + core.info(`PRIVATE_KEY_FILE: ${PRIVATE_KEY_FILE}`); + const lines = privateKey.split(/\r\n|\r|\n/).length; + core.info(`Private key contains ${lines} lines`); + let output = ''; const options: ExecOptions = { - silent: true, listeners: { stdout: (data: Buffer) => { output += data.toString(); @@ -26,11 +30,7 @@ export async function importKey(privateKey: string) { } }; - await exec.exec( - 'gpg', - ['--batch', '--import-options', 'import-show', '--import', PRIVATE_KEY_FILE], - options - ); + await exec.exec('gpg', ['--batch', '--verbose', '--import', PRIVATE_KEY_FILE], options); await io.rmRF(PRIVATE_KEY_FILE);