Gitea_Action/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-05-21 18:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed gpg import to run in key directory

Browse Source
This commit is contained in:
Jared Petersen 2020-05-02 16:27:48 -07:00
parent 14d3f1d12c
commit 01f7e3b3fd
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
__tests__/auth.test.ts
View File

@ -23,7 +23,7 @@ const env = process.env;
const m2Dir = path.join(__dirname, auth.M2_DIR); const m2Dir = path.join(__dirname, auth.M2_DIR);
const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE); const settingsFile = path.join(m2Dir, auth.SETTINGS_FILE);
const gpgDir = path.join(__dirname, auth.GPG_DIR); const gpgDir = path.join(__dirname, auth.GPG_DIR);
const gpgFile = path.join(gpgDir, auth.GPG_FILE); const gpgFile = auth.GPG_FILE;
describe('auth tests', () => { describe('auth tests', () => {
beforeEach(async () => { beforeEach(async () => {
@ -180,7 +180,11 @@ describe('auth tests', () => {
await auth.configAuthentication(id, username, password, gpgPrivateKey); await auth.configAuthentication(id, username, password, gpgPrivateKey);
expect(exec.exec).toHaveBeenCalledWith(`gpg --import --batch ${gpgFile}`); expect(exec.exec).toHaveBeenCalledWith(
'gpg',
['--import', '--batch', gpgFile],
{cwd: gpgDir}
);
expect(fs.existsSync(gpgDir)).toBe(false); expect(fs.existsSync(gpgDir)).toBe(false);
}, 100000); }, 100000);
@ -193,7 +197,9 @@ describe('auth tests', () => {
await auth.configAuthentication(id, username, password); await auth.configAuthentication(id, username, password);
expect(exec.exec).not.toHaveBeenCalledWith( expect(exec.exec).not.toHaveBeenCalledWith(
`gpg --import --batch ${gpgFile}` 'gpg',
['--import', '--batch', gpgFile],
{cwd: gpgDir}
); );
expect(fs.existsSync(gpgDir)).toBe(false); expect(fs.existsSync(gpgDir)).toBe(false);

BIN
dist/index.js generated vendored
View File

Binary file not shown.

5
src/auth.ts
View File

@ -13,8 +13,8 @@ export const GPG_FILE = 'private.asc';
export const DEFAULT_ID = 'github'; export const DEFAULT_ID = 'github';
export const DEFAULT_USERNAME = 'GITHUB_ACTOR'; export const DEFAULT_USERNAME = 'GITHUB_ACTOR';
export const DEFAULT_PASSWORD = 'GITHUB_TOKEN'; export const DEFAULT_PASSWORD = 'GITHUB_TOKEN';
export const DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
export const DEFAULT_GPG_PRIVATE_KEY = ''; export const DEFAULT_GPG_PRIVATE_KEY = '';
export const DEFAULT_GPG_PASSPHRASE = 'GPG_PASSPHRASE';
export async function configAuthentication( export async function configAuthentication(
id = DEFAULT_ID, id = DEFAULT_ID,
@ -110,6 +110,5 @@ async function write(directory: string, file: string, contents: string) {
} }
async function importGpgKey(directory: string, file: string) { async function importGpgKey(directory: string, file: string) {
const location = path.join(directory, file); exec.exec('gpg', ['--import', '--batch', file], {cwd: directory});
exec.exec(`gpg --import --batch ${location}`);
} }