fix: set safe directory

This commit is contained in:
Tom Hu 2024-02-23 16:34:24 -08:00
parent 0cfda1dd0a
commit 4704678742
No known key found for this signature in database
GPG key ID: 79155678363963D2
7 changed files with 114 additions and 12 deletions

View file

@ -42,3 +42,43 @@ jobs:
version: v0.2.0 version: v0.2.0
verbose: true verbose: true
token: ${{ secrets.CODECOV_TOKEN }} token: ${{ secrets.CODECOV_TOKEN }}
run:
runs-on: ubuntu-latest
container: node:18
steps:
- name: Checkout
uses: actions/checkout@v4.1.1
- name: Install dependencies
run: npm install
- name: Lint
run: npm run lint
- name: Run tests and collect coverage
run: npm run test
- name: Upload coverage to Codecov (script)
uses: ./
with:
files: ./coverage/script/coverage-final.json
flags: script,${{ matrix.os }}
name: codecov-script
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload coverage to Codecov (demo)
uses: ./
with:
files: ./coverage/calculator/coverage-final.json,./coverage/coverage-test/coverage-final.json
file: ./coverage/coverage-final.json
flags: demo,${{ matrix.os }}
name: codecov-demo
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}
- name: Upload coverage to Codecov (version)
uses: ./
with:
files: ./coverage/calculator/coverage-final.json,./coverage/coverage-test/coverage-final.json
file: ./coverage/coverage-final.json
flags: version,${{ matrix.os }}
name: codecov-version
version: v0.2.0
verbose: true
token: ${{ secrets.CODECOV_TOKEN }}

View file

@ -41,6 +41,9 @@ inputs:
flags: flags:
description: 'Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)' description: 'Flag upload to group coverage metrics (e.g. unittests | integration | ui,chrome)'
required: false required: false
git_service:
description: 'Override the git_service (e.g. github_enterprise)'
required: false
handle_no_reports_found: handle_no_reports_found:
description: 'Raise no exceptions when no coverage reports found' description: 'Raise no exceptions when no coverage reports found'
required: false required: false

44
dist/index.js vendored
View file

@ -32261,6 +32261,7 @@ const isTrue = (variable) => {
}; };
const buildCommitExec = () => { const buildCommitExec = () => {
const commitParent = core.getInput('commit_parent'); const commitParent = core.getInput('commit_parent');
const gitService = core.getInput('git_service');
const overrideBranch = core.getInput('override_branch'); const overrideBranch = core.getInput('override_branch');
const overrideCommit = core.getInput('override_commit'); const overrideCommit = core.getInput('override_commit');
const overridePr = core.getInput('override_pr'); const overridePr = core.getInput('override_pr');
@ -32285,6 +32286,7 @@ const buildCommitExec = () => {
if (commitParent) { if (commitParent) {
commitExecArgs.push('--parent-sha', `${commitParent}`); commitExecArgs.push('--parent-sha', `${commitParent}`);
} }
commitExecArgs.push(`--git-service ${gitService ? gitService : 'github'}`);
if (overrideBranch) { if (overrideBranch) {
commitExecArgs.push('-B', `${overrideBranch}`); commitExecArgs.push('-B', `${overrideBranch}`);
} }
@ -32329,6 +32331,7 @@ const buildGeneralExec = () => {
return { args, verbose }; return { args, verbose };
}; };
const buildReportExec = () => { const buildReportExec = () => {
const gitService = core.getInput('git_service');
const overrideCommit = core.getInput('override_commit'); const overrideCommit = core.getInput('override_commit');
const overridePr = core.getInput('override_pr'); const overridePr = core.getInput('override_pr');
const slug = core.getInput('slug'); const slug = core.getInput('slug');
@ -32349,6 +32352,7 @@ const buildReportExec = () => {
if (token) { if (token) {
reportOptions.env.CODECOV_TOKEN = token; reportOptions.env.CODECOV_TOKEN = token;
} }
reportExecArgs.push(`--git-service ${gitService ? gitService : 'github'}`);
if (overrideCommit) { if (overrideCommit) {
reportExecArgs.push('-C', `${overrideCommit}`); reportExecArgs.push('-C', `${overrideCommit}`);
} }
@ -32383,6 +32387,7 @@ const buildUploadExec = () => {
const file = core.getInput('file'); const file = core.getInput('file');
const files = core.getInput('files'); const files = core.getInput('files');
const flags = core.getInput('flags'); const flags = core.getInput('flags');
const gitService = core.getInput('git_service');
const handleNoReportsFound = isTrue(core.getInput('handle_no_reports_found')); const handleNoReportsFound = isTrue(core.getInput('handle_no_reports_found'));
const jobCode = core.getInput('job_code'); const jobCode = core.getInput('job_code');
const name = core.getInput('name'); const name = core.getInput('name');
@ -32455,6 +32460,7 @@ const buildUploadExec = () => {
uploadExecArgs.push('-F', `${f}`); uploadExecArgs.push('-F', `${f}`);
}); });
} }
uploadExecArgs.push(`--git-service ${gitService ? gitService : 'github'}`);
if (handleNoReportsFound) { if (handleNoReportsFound) {
uploadExecArgs.push('--handle-no-reports-found'); uploadExecArgs.push('--handle-no-reports-found');
} }
@ -32527,6 +32533,16 @@ const buildUploadExec = () => {
;// CONCATENATED MODULE: ./src/helpers.ts ;// CONCATENATED MODULE: ./src/helpers.ts
var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
const PLATFORMS = [ const PLATFORMS = [
'linux', 'linux',
@ -32578,6 +32594,21 @@ const getCommand = (filename, generalArgs, command) => {
core.info(`==> Running command '${fullCommand.join(' ')}'`); core.info(`==> Running command '${fullCommand.join(' ')}'`);
return fullCommand; return fullCommand;
}; };
const setSafeDirectory = () => __awaiter(void 0, void 0, void 0, function* () {
const isSafe = yield exec.exec('git config --get safe.directory');
if (!isSafe) {
const command = ([
'git',
'config',
'--global',
'--add',
'safe.directory',
`${process.env['GITHUB_WORKSPACE']}`,
].join(' '));
core.info(`==> Running ${command}`);
yield exec.exec(command);
}
});
// EXTERNAL MODULE: external "crypto" // EXTERNAL MODULE: external "crypto"
@ -32587,7 +32618,7 @@ var gpg = __nccwpck_require__(40);
// EXTERNAL MODULE: ./node_modules/undici/index.js // EXTERNAL MODULE: ./node_modules/undici/index.js
var undici = __nccwpck_require__(1773); var undici = __nccwpck_require__(1773);
;// CONCATENATED MODULE: ./src/validate.ts ;// CONCATENATED MODULE: ./src/validate.ts
var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) { var validate_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) { return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@ -32603,7 +32634,7 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume
const verify = (filename, platform, version, verbose, failCi) => __awaiter(void 0, void 0, void 0, function* () { const verify = (filename, platform, version, verbose, failCi) => validate_awaiter(void 0, void 0, void 0, function* () {
try { try {
const uploaderName = getUploaderName(platform); const uploaderName = getUploaderName(platform);
// Get SHASUM and SHASUM signature files // Get SHASUM and SHASUM signature files
@ -32620,8 +32651,8 @@ const verify = (filename, platform, version, verbose, failCi) => __awaiter(void
console.log(`Received SHA256SUM signature ${shaSig}`); console.log(`Received SHA256SUM signature ${shaSig}`);
} }
yield external_fs_.writeFileSync(external_path_.join(__dirname, `${uploaderName}.SHA256SUM.sig`), shaSig); yield external_fs_.writeFileSync(external_path_.join(__dirname, `${uploaderName}.SHA256SUM.sig`), shaSig);
const validateSha = () => __awaiter(void 0, void 0, void 0, function* () { const validateSha = () => validate_awaiter(void 0, void 0, void 0, function* () {
const calculateHash = (filename) => __awaiter(void 0, void 0, void 0, function* () { const calculateHash = (filename) => validate_awaiter(void 0, void 0, void 0, function* () {
const stream = external_fs_.createReadStream(filename); const stream = external_fs_.createReadStream(filename);
const uploaderSha = external_crypto_.createHash(`sha256`); const uploaderSha = external_crypto_.createHash(`sha256`);
stream.pipe(uploaderSha); stream.pipe(uploaderSha);
@ -32646,7 +32677,7 @@ const verify = (filename, platform, version, verbose, failCi) => __awaiter(void
'--verify', '--verify',
external_path_.join(__dirname, `${uploaderName}.SHA256SUM.sig`), external_path_.join(__dirname, `${uploaderName}.SHA256SUM.sig`),
external_path_.join(__dirname, `${uploaderName}.SHA256SUM`), external_path_.join(__dirname, `${uploaderName}.SHA256SUM`),
], (err, verifyResult) => __awaiter(void 0, void 0, void 0, function* () { ], (err, verifyResult) => validate_awaiter(void 0, void 0, void 0, function* () {
if (err) { if (err) {
setFailure('Codecov: Error importing pgp key', failCi); setFailure('Codecov: Error importing pgp key', failCi);
} }
@ -32661,7 +32692,7 @@ const verify = (filename, platform, version, verbose, failCi) => __awaiter(void
'--no-default-keyring', '--no-default-keyring',
'--import', '--import',
__nccwpck_require__.ab + "pgp_keys.asc", __nccwpck_require__.ab + "pgp_keys.asc",
], (err, importResult) => __awaiter(void 0, void 0, void 0, function* () { ], (err, importResult) => validate_awaiter(void 0, void 0, void 0, function* () {
if (err) { if (err) {
setFailure('Codecov: Error importing pgp key', failCi); setFailure('Codecov: Error importing pgp key', failCi);
} }
@ -32742,6 +32773,7 @@ try {
yield validate(filename, platform, uploaderVersion, verbose, failCi); yield validate(filename, platform, uploaderVersion, verbose, failCi);
yield version(platform, uploaderVersion); yield version(platform, uploaderVersion);
yield external_fs_.chmodSync(filename, '777'); yield external_fs_.chmodSync(filename, '777');
yield setSafeDirectory();
const unlink = () => { const unlink = () => {
external_fs_.unlink(filename, (err) => { external_fs_.unlink(filename, (err) => {
if (err) { if (err) {

2
dist/index.js.map vendored

File diff suppressed because one or more lines are too long

View file

@ -20,6 +20,7 @@ const isTrue = (variable) => {
const buildCommitExec = () => { const buildCommitExec = () => {
const commitParent = core.getInput('commit_parent'); const commitParent = core.getInput('commit_parent');
const gitService = core.getInput('git_service');
const overrideBranch = core.getInput('override_branch'); const overrideBranch = core.getInput('override_branch');
const overrideCommit = core.getInput('override_commit'); const overrideCommit = core.getInput('override_commit');
const overridePr = core.getInput('override_pr'); const overridePr = core.getInput('override_pr');
@ -48,6 +49,7 @@ const buildCommitExec = () => {
if (commitParent) { if (commitParent) {
commitExecArgs.push('--parent-sha', `${commitParent}`); commitExecArgs.push('--parent-sha', `${commitParent}`);
} }
commitExecArgs.push(`--git-service ${gitService ? gitService : 'github'}`);
if (overrideBranch) { if (overrideBranch) {
commitExecArgs.push('-B', `${overrideBranch}`); commitExecArgs.push('-B', `${overrideBranch}`);
@ -100,6 +102,7 @@ const buildGeneralExec = () => {
}; };
const buildReportExec = () => { const buildReportExec = () => {
const gitService = core.getInput('git_service');
const overrideCommit = core.getInput('override_commit'); const overrideCommit = core.getInput('override_commit');
const overridePr = core.getInput('override_pr'); const overridePr = core.getInput('override_pr');
const slug = core.getInput('slug'); const slug = core.getInput('slug');
@ -125,6 +128,8 @@ const buildReportExec = () => {
if (token) { if (token) {
reportOptions.env.CODECOV_TOKEN = token; reportOptions.env.CODECOV_TOKEN = token;
} }
reportExecArgs.push(`--git-service ${gitService ? gitService : 'github'}`);
if (overrideCommit) { if (overrideCommit) {
reportExecArgs.push('-C', `${overrideCommit}`); reportExecArgs.push('-C', `${overrideCommit}`);
} else if ( } else if (
@ -163,6 +168,7 @@ const buildUploadExec = () => {
const file = core.getInput('file'); const file = core.getInput('file');
const files = core.getInput('files'); const files = core.getInput('files');
const flags = core.getInput('flags'); const flags = core.getInput('flags');
const gitService = core.getInput('git_service');
const handleNoReportsFound = isTrue(core.getInput('handle_no_reports_found')); const handleNoReportsFound = isTrue(core.getInput('handle_no_reports_found'));
const jobCode = core.getInput('job_code'); const jobCode = core.getInput('job_code');
const name = core.getInput('name'); const name = core.getInput('name');
@ -239,6 +245,7 @@ const buildUploadExec = () => {
uploadExecArgs.push('-F', `${f}`); uploadExecArgs.push('-F', `${f}`);
}); });
} }
uploadExecArgs.push(`--git-service ${gitService ? gitService : 'github'}`);
if (handleNoReportsFound) { if (handleNoReportsFound) {
uploadExecArgs.push('--handle-no-reports-found'); uploadExecArgs.push('--handle-no-reports-found');
} }

View file

@ -1,4 +1,5 @@
import * as core from '@actions/core'; import * as core from '@actions/core';
import * as exec from '@actions/exec';
const PLATFORMS = [ const PLATFORMS = [
'linux', 'linux',
@ -64,6 +65,22 @@ const getCommand = (
return fullCommand; return fullCommand;
}; };
const setSafeDirectory = async () => {
const isSafe = await exec.exec('git config --get safe.directory');
if (!isSafe) {
const command = ([
'git',
'config',
'--global',
'--add',
'safe.directory',
`${process.env['GITHUB_WORKSPACE']}`,
].join(' '));
core.info(`==> Running ${command}`);
await exec.exec(command);
}
};
export { export {
PLATFORMS, PLATFORMS,
getBaseUrl, getBaseUrl,
@ -72,5 +89,6 @@ export {
isValidPlatform, isValidPlatform,
isWindows, isWindows,
setFailure, setFailure,
setSafeDirectory,
getCommand, getCommand,
}; };

View file

@ -12,10 +12,11 @@ import {
} from './buildExec'; } from './buildExec';
import { import {
getBaseUrl, getBaseUrl,
getCommand,
getPlatform, getPlatform,
getUploaderName, getUploaderName,
setFailure, setFailure,
getCommand, setSafeDirectory,
} from './helpers'; } from './helpers';
import verify from './validate'; import verify from './validate';
@ -55,6 +56,7 @@ try {
await verify(filename, platform, uploaderVersion, verbose, failCi); await verify(filename, platform, uploaderVersion, verbose, failCi);
await versionInfo(platform, uploaderVersion); await versionInfo(platform, uploaderVersion);
await fs.chmodSync(filename, '777'); await fs.chmodSync(filename, '777');
await setSafeDirectory();
const unlink = () => { const unlink = () => {
fs.unlink(filename, (err) => { fs.unlink(filename, (err) => {