Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add more verbosity to validation #747

Merged
merged 3 commits into from May 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/main.yml
Expand Up @@ -15,13 +15,15 @@ jobs:
files: ./coverage/script/coverage-final.json
flags: script,${{ matrix.os }}
name: codecov-script
verbose: true
- 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
- name: Upload coverage to Codecov (version)
uses: ./
with:
Expand All @@ -30,6 +32,7 @@ jobs:
flags: version,${{ matrix.os }}
name: codecov-version
version: v0.1.0_8880
verbose: true
run:
runs-on: ${{ matrix.os }}
strategy:
Expand All @@ -50,13 +53,15 @@ jobs:
files: ./coverage/script/coverage-final.json
flags: script,${{ matrix.os }}
name: codecov-script
verbose: true
- 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
- name: Upload coverage to Codecov (version)
uses: ./
with:
Expand All @@ -65,3 +70,4 @@ jobs:
flags: version,${{ matrix.os }}
name: codecov-version
version: v0.1.0_8880
verbose: true
14 changes: 10 additions & 4 deletions dist/index.js 100644 → 100755
Expand Up @@ -19505,7 +19505,7 @@ const buildExec = () => {
if (uploaderVersion == '') {
uploaderVersion = 'latest';
}
return { execArgs, options, failCi, os, uploaderVersion };
return { execArgs, options, failCi, os, uploaderVersion, verbose };
};
/* harmony default export */ const src_buildExec = (buildExec);

Expand Down Expand Up @@ -21679,7 +21679,7 @@ var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argume



const verify = (filename, platform, version) => __awaiter(void 0, void 0, void 0, function* () {
const verify = (filename, platform, version, verbose) => __awaiter(void 0, void 0, void 0, function* () {
try {
const uploaderName = getUploaderName(platform);
// Read in public key
Expand All @@ -21688,8 +21688,14 @@ const verify = (filename, platform, version) => __awaiter(void 0, void 0, void 0
console.log(`${getBaseUrl(platform, version)}.SHA256SUM`);
const shasumRes = yield fetch(`${getBaseUrl(platform, version)}.SHA256SUM`);
const shasum = yield shasumRes.text();
if (verbose) {
console.log(`Received SHA256SUM ${shasum}`);
}
const shaSigRes = yield fetch(`${getBaseUrl(platform, version)}.SHA256SUM.sig`);
const shaSig = yield shaSigRes.text();
if (verbose) {
console.log(`Received SHA256SUM signature ${shaSig}`);
}
// Verify shasum
const verified = yield openpgp_min/* verify */.T({
message: yield openpgp_min/* createMessage */.tn({ text: shasum }),
Expand Down Expand Up @@ -21777,7 +21783,7 @@ var src_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _argu

let failCi;
try {
const { execArgs, options, failCi, os, uploaderVersion } = src_buildExec();
const { execArgs, options, failCi, os, uploaderVersion, verbose } = src_buildExec();
const platform = getPlatform(os);
const filename = external_path_.join(__dirname, getUploaderName(platform));
external_https_.get(getBaseUrl(platform, uploaderVersion), (res) => {
Expand All @@ -21789,7 +21795,7 @@ try {
setFailure(`Codecov: Failed to write uploader binary: ${err.message}`, true);
}).on('finish', () => src_awaiter(void 0, void 0, void 0, function* () {
filePath.close();
yield validate(filename, platform, uploaderVersion);
yield validate(filename, platform, uploaderVersion, verbose);
yield version(platform, uploaderVersion);
yield external_fs_.chmodSync(filename, '777');
const unlink = () => {
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/buildExec.ts
Expand Up @@ -176,7 +176,7 @@ const buildExec = () => {
uploaderVersion = 'latest';
}

return {execArgs, options, failCi, os, uploaderVersion};
return {execArgs, options, failCi, os, uploaderVersion, verbose};
};

export default buildExec;
4 changes: 2 additions & 2 deletions src/index.ts
Expand Up @@ -18,7 +18,7 @@ import versionInfo from './version';
let failCi;

try {
const {execArgs, options, failCi, os, uploaderVersion} = buildExec();
const {execArgs, options, failCi, os, uploaderVersion, verbose} = buildExec();
const platform = getPlatform(os);

const filename = path.join( __dirname, getUploaderName(platform));
Expand All @@ -35,7 +35,7 @@ try {
}).on('finish', async () => {
filePath.close();

await verify(filename, platform, uploaderVersion);
await verify(filename, platform, uploaderVersion, verbose);
await versionInfo(platform, uploaderVersion);
await fs.chmodSync(filename, '777');

Expand Down
7 changes: 7 additions & 0 deletions src/validate.ts
Expand Up @@ -16,6 +16,7 @@ const verify = async (
filename: string,
platform: string,
version: string,
verbose: boolean,
): Promise<void> => {
try {
const uploaderName = getUploaderName(platform);
Expand All @@ -32,11 +33,17 @@ const verify = async (
`${getBaseUrl(platform, version)}.SHA256SUM`,
);
const shasum = await shasumRes.text();
if (verbose) {
console.log(`Received SHA256SUM ${shasum}`);
}

const shaSigRes = await fetch.default(
`${getBaseUrl(platform, version)}.SHA256SUM.sig`,
);
const shaSig = await shaSigRes.text();
if (verbose) {
console.log(`Received SHA256SUM signature ${shaSig}`);
}

// Verify shasum
const verified = await openpgp.verify({
Expand Down