Cleanup code and tests

This commit is contained in:
CrazyMax 2020-05-07 12:11:19 +02:00
parent f1338960fb
commit 5cc6b8eb5b
8 changed files with 38 additions and 22 deletions

View File

@ -42,7 +42,7 @@ Following inputs can be used as `step.with` keys
| Name | Type | Default | Description |
|---------------|---------|-----------|-------------------------------|
| `version` | String | `latest` | UPX version. Example: `3.95` |
| `version` | String | `latest` | UPX version. Example: `v3.95` |
| `file` | String | | File to compress |
| `args` | String | | Arguments to pass to UPX |

View File

@ -1,8 +1,16 @@
import * as github from '../src/github';
describe('github', () => {
it('returns 3.96 GitHub release', async () => {
const release = await github.getRelease('3.96');
it('returns latest UPX GitHub release', async () => {
const release = await github.getRelease('latest');
console.log(release);
expect(release).not.toBeNull();
expect(release?.tag_name).not.toEqual('');
});
it('returns v3.96 GoReleaser GitHub release', async () => {
const release = await github.getRelease('v3.96');
console.log(release);
expect(release).not.toBeNull();
expect(release?.tag_name).toEqual('v3.96');
});

View File

@ -2,13 +2,15 @@ import fs = require('fs');
import * as installer from '../src/installer';
describe('installer', () => {
it('acquires 3.95 version of UPX', async () => {
const upx = await installer.getUPX('3.95');
it('acquires v3.95 version of UPX', async () => {
const upx = await installer.getUPX('v3.95');
console.log(upx);
expect(fs.existsSync(upx)).toBe(true);
}, 100000);
it('acquires latest version of UPX', async () => {
const upx = await installer.getUPX('latest');
console.log(upx);
expect(fs.existsSync(upx)).toBe(true);
}, 100000);
});

16
dist/index.js generated vendored
View File

@ -1305,7 +1305,6 @@ function run() {
}
});
}
exports.run = run;
run();
//# sourceMappingURL=main.js.map
@ -4620,8 +4619,8 @@ const util = __importStar(__webpack_require__(669));
const github = __importStar(__webpack_require__(824));
const core = __importStar(__webpack_require__(470));
const tc = __importStar(__webpack_require__(533));
let osPlat = os.platform();
let osArch = os.arch();
const osPlat = os.platform();
const osArch = os.arch();
function getUPX(version) {
return __awaiter(this, void 0, void 0, function* () {
const release = yield github.getRelease(version);
@ -4629,7 +4628,6 @@ function getUPX(version) {
throw new Error(`Cannot find UPX ${version} release`);
}
const semver = release.tag_name.replace(/^v/, '');
core.debug(`Semver is ${semver}`);
core.info(`✅ UPX version found: ${semver}`);
const filename = util.format('%s.%s', getName(semver), osPlat == 'win32' ? 'zip' : 'tar.xz');
const downloadUrl = util.format('https://github.com/upx/upx/releases/download/v%s/%s', semver, filename);
@ -4637,9 +4635,15 @@ function getUPX(version) {
const downloadPath = yield tc.downloadTool(downloadUrl);
core.debug(`Downloaded to ${downloadPath}`);
core.info('📦 Extracting UPX...');
const extPath = osPlat == 'win32' ? yield tc.extractZip(downloadPath) : yield tc.extractTar(downloadPath, undefined, 'x');
let extPath;
if (osPlat == 'win32') {
extPath = yield tc.extractZip(downloadPath);
}
else {
extPath = yield tc.extractTar(downloadPath, undefined, 'x');
}
core.debug(`Extracted to ${extPath}`);
const cachePath = yield tc.cacheDir(extPath, 'ghaction-upx', version);
const cachePath = yield tc.cacheDir(extPath, 'ghaction-upx', semver);
core.debug(`Cached to ${cachePath}`);
const exePath = path.join(cachePath, getName(semver), osPlat == 'win32' ? 'upx.exe' : 'upx');
core.debug(`Exe path is ${exePath}`);

View File

@ -7,5 +7,5 @@ module.exports = {
transform: {
'^.+\\.ts$': 'ts-jest'
},
verbose: true
verbose: false
}

View File

@ -5,17 +5,15 @@ import * as github from './github';
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
let osPlat: string = os.platform();
let osArch: string = os.arch();
const osPlat: string = os.platform();
const osArch: string = os.arch();
export async function getUPX(version: string): Promise<string> {
const release: github.GitHubRelease | null = await github.getRelease(version);
if (!release) {
throw new Error(`Cannot find UPX ${version} release`);
}
const semver: string = release.tag_name.replace(/^v/, '');
core.debug(`Semver is ${semver}`);
core.info(`✅ UPX version found: ${semver}`);
const filename = util.format('%s.%s', getName(semver), osPlat == 'win32' ? 'zip' : 'tar.xz');
@ -26,11 +24,15 @@ export async function getUPX(version: string): Promise<string> {
core.debug(`Downloaded to ${downloadPath}`);
core.info('📦 Extracting UPX...');
const extPath: string =
osPlat == 'win32' ? await tc.extractZip(downloadPath) : await tc.extractTar(downloadPath, undefined, 'x');
let extPath: string;
if (osPlat == 'win32') {
extPath = await tc.extractZip(downloadPath);
} else {
extPath = await tc.extractTar(downloadPath, undefined, 'x');
}
core.debug(`Extracted to ${extPath}`);
const cachePath: string = await tc.cacheDir(extPath, 'ghaction-upx', version);
const cachePath: string = await tc.cacheDir(extPath, 'ghaction-upx', semver);
core.debug(`Cached to ${cachePath}`);
const exePath: string = path.join(cachePath, getName(semver), osPlat == 'win32' ? 'upx.exe' : 'upx');

View File

@ -4,7 +4,7 @@ import * as installer from './installer';
import * as core from '@actions/core';
import * as exec from '@actions/exec';
export async function run() {
async function run(): Promise<void> {
try {
if (os.platform() == 'darwin') {
core.setFailed('Not supported on darwin platform');