refactor: remove unneeded codecov copy and unlink

This commit is contained in:
Tom Hu
2021-06-11 13:03:50 -04:00
parent bb99ca5cc2
commit 861141ec76
4 changed files with 24 additions and 94 deletions

48
dist/index.js vendored
View File

@@ -7539,7 +7539,7 @@ var buildExec = function () {
var xcodeDerivedData = core.getInput('xcode_derived_data'); var xcodeDerivedData = core.getInput('xcode_derived_data');
var xcodePackage = core.getInput('xcode_package'); var xcodePackage = core.getInput('xcode_package');
var filepath = workingDir ? var filepath = workingDir ?
workingDir + '/codecov.sh' : 'codecov.sh'; workingDir + '/codecov' : 'codecov';
var execArgs = [filepath]; var execArgs = [filepath];
execArgs.push('-n', "" + name, '-F', "" + flags, '-Q', "github-action-" + version); execArgs.push('-n', "" + name, '-F', "" + flags, '-Q', "github-action-" + version);
var options = {}; var options = {};
@@ -7658,57 +7658,23 @@ var buildExec = function () {
if (xcodePackage) { if (xcodePackage) {
execArgs.push('-J', "" + xcodePackage); execArgs.push('-J', "" + xcodePackage);
} }
return { execArgs: execArgs, options: options, filepath: filepath, failCi: failCi }; return { execArgs: execArgs, options: options, failCi: failCi };
}; };
/* harmony default export */ const src_buildExec = (buildExec); /* harmony default export */ const src_buildExec = (buildExec);
;// CONCATENATED MODULE: ./src/index.ts ;// CONCATENATED MODULE: ./src/index.ts
var src_core = __nccwpck_require__(2186); var src_core = __nccwpck_require__(2186);
var exec = __nccwpck_require__(1514); var exec = __nccwpck_require__(1514);
var fs = __nccwpck_require__(5747);
var codecovScript = fs.readFileSync(__nccwpck_require__.ab + "codecov"); var _a = src_buildExec(), execArgs = _a.execArgs, options = _a.options, failCi = _a.failCi;
var failCi; exec.exec('bash', execArgs, options)["catch"](function (err) {
try {
var _a = src_buildExec(), execArgs_1 = _a.execArgs, options_1 = _a.options, filepath_1 = _a.filepath, failCi_1 = _a.failCi;
fs.writeFile(filepath_1, codecovScript, function (err) {
if (err && failCi_1) {
throw err;
}
else if (err) {
src_core.warning("Codecov warning: " + err.message);
}
exec.exec('bash', execArgs_1, options_1)["catch"](function (err) {
if (failCi_1) {
src_core.setFailed("Codecov failed with the following error: " + err.message);
}
else {
src_core.warning("Codecov warning: " + err.message);
}
})
.then(function () {
unlinkFile();
});
var unlinkFile = function () {
fs.unlink(filepath_1, function (err) {
if (err && failCi_1) {
throw err;
}
else if (err) {
src_core.warning("Codecov warning: " + err.message);
}
});
};
});
}
catch (error) {
if (failCi) { if (failCi) {
src_core.setFailed("Codecov failed with the following error: " + error.message); src_core.setFailed("Codecov failed with the following error: " + err.message);
} }
else { else {
src_core.warning("Codecov warning: " + error.message); src_core.warning("Codecov warning: " + err.message);
} }
} });
})(); })();

View File

@@ -6,10 +6,10 @@ import VERSION from './version';
const context = github.context; const context = github.context;
test('no arguments', () => { test('no arguments', () => {
const {execArgs, filepath, failCi} = buildExec(); const {execArgs, failCi} = buildExec();
const args = [ const args = [
'codecov.sh', 'codecov',
'-n', '-n',
'', '',
'-F', '-F',
@@ -21,7 +21,6 @@ test('no arguments', () => {
args.push('-C', `${context.payload.pull_request.head.sha}`); args.push('-C', `${context.payload.pull_request.head.sha}`);
} }
expect(execArgs).toEqual(args); expect(execArgs).toEqual(args);
expect(filepath).toEqual('codecov.sh');
expect(failCi).toBeFalsy(); expect(failCi).toBeFalsy();
}); });
@@ -65,9 +64,9 @@ test('all arguments', () => {
process.env['INPUT_' + env.toUpperCase()] = envs[env]; process.env['INPUT_' + env.toUpperCase()] = envs[env];
} }
const {execArgs, filepath, failCi} = buildExec(); const {execArgs, failCi} = buildExec();
expect(execArgs).toEqual([ expect(execArgs).toEqual([
'src/codecov.sh', 'src/codecov',
'-n', '-n',
'codecov', 'codecov',
'-F', '-F',
@@ -142,7 +141,6 @@ test('all arguments', () => {
'-J', '-J',
'MyApp', 'MyApp',
]); ]);
expect(filepath).toEqual('src/codecov.sh');
expect(failCi).toBeTruthy(); expect(failCi).toBeTruthy();
for (const env of Object.keys(envs)) { for (const env of Object.keys(envs)) {

View File

@@ -50,7 +50,7 @@ const buildExec = () => {
const xcodePackage = core.getInput('xcode_package'); const xcodePackage = core.getInput('xcode_package');
const filepath = workingDir ? const filepath = workingDir ?
workingDir + '/codecov.sh' : 'codecov.sh'; workingDir + '/codecov' : 'codecov';
const execArgs = [filepath]; const execArgs = [filepath];
execArgs.push( execArgs.push(
@@ -182,7 +182,7 @@ const buildExec = () => {
execArgs.push('-J', `${xcodePackage}`); execArgs.push('-J', `${xcodePackage}`);
} }
return {execArgs, options, filepath, failCi}; return {execArgs, options, failCi};
}; };
export default buildExec; export default buildExec;

View File

@@ -1,51 +1,17 @@
const core = require('@actions/core'); const core = require('@actions/core');
const exec = require('@actions/exec'); const exec = require('@actions/exec');
const fs = require('fs');
import buildExec from './buildExec'; import buildExec from './buildExec';
const codecovScript = fs.readFileSync(__dirname + '/codecov'); const {execArgs, options, failCi} = buildExec();
let failCi; exec.exec('bash', execArgs, options)
try { .catch((err) => {
const {execArgs, options, filepath, failCi} = buildExec(); if (failCi) {
core.setFailed(
fs.writeFile(filepath, codecovScript, (err) => { `Codecov failed with the following error: ${err.message}`,
if (err && failCi) { );
throw err; } else {
} else if (err) { core.warning(`Codecov warning: ${err.message}`);
core.warning(`Codecov warning: ${err.message}`); }
} });
exec.exec('bash', execArgs, options)
.catch((err) => {
if (failCi) {
core.setFailed(
`Codecov failed with the following error: ${err.message}`,
);
} else {
core.warning(`Codecov warning: ${err.message}`);
}
})
.then(() => {
unlinkFile();
});
const unlinkFile = () => {
fs.unlink(filepath, (err) => {
if (err && failCi) {
throw err;
} else if (err) {
core.warning(`Codecov warning: ${err.message}`);
}
});
};
});
} catch (error) {
if (failCi) {
core.setFailed(`Codecov failed with the following error: ${error.message}`);
} else {
core.warning(`Codecov warning: ${error.message}`);
}
}