mirror of
https://github.com/crazy-max/ghaction-upx.git
synced 2024-11-21 09:56:09 -07:00
Cleanup code and tests
This commit is contained in:
parent
f1338960fb
commit
5cc6b8eb5b
|
@ -42,7 +42,7 @@ Following inputs can be used as `step.with` keys
|
||||||
|
|
||||||
| Name | Type | Default | Description |
|
| 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 |
|
| `file` | String | | File to compress |
|
||||||
| `args` | String | | Arguments to pass to UPX |
|
| `args` | String | | Arguments to pass to UPX |
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,16 @@
|
||||||
import * as github from '../src/github';
|
import * as github from '../src/github';
|
||||||
|
|
||||||
describe('github', () => {
|
describe('github', () => {
|
||||||
it('returns 3.96 GitHub release', async () => {
|
it('returns latest UPX GitHub release', async () => {
|
||||||
const release = await github.getRelease('3.96');
|
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).not.toBeNull();
|
||||||
expect(release?.tag_name).toEqual('v3.96');
|
expect(release?.tag_name).toEqual('v3.96');
|
||||||
});
|
});
|
||||||
|
|
|
@ -2,13 +2,15 @@ import fs = require('fs');
|
||||||
import * as installer from '../src/installer';
|
import * as installer from '../src/installer';
|
||||||
|
|
||||||
describe('installer', () => {
|
describe('installer', () => {
|
||||||
it('acquires 3.95 version of UPX', async () => {
|
it('acquires v3.95 version of UPX', async () => {
|
||||||
const upx = await installer.getUPX('3.95');
|
const upx = await installer.getUPX('v3.95');
|
||||||
|
console.log(upx);
|
||||||
expect(fs.existsSync(upx)).toBe(true);
|
expect(fs.existsSync(upx)).toBe(true);
|
||||||
}, 100000);
|
}, 100000);
|
||||||
|
|
||||||
it('acquires latest version of UPX', async () => {
|
it('acquires latest version of UPX', async () => {
|
||||||
const upx = await installer.getUPX('latest');
|
const upx = await installer.getUPX('latest');
|
||||||
|
console.log(upx);
|
||||||
expect(fs.existsSync(upx)).toBe(true);
|
expect(fs.existsSync(upx)).toBe(true);
|
||||||
}, 100000);
|
}, 100000);
|
||||||
});
|
});
|
||||||
|
|
16
dist/index.js
generated
vendored
16
dist/index.js
generated
vendored
|
@ -1305,7 +1305,6 @@ function run() {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
exports.run = run;
|
|
||||||
run();
|
run();
|
||||||
//# sourceMappingURL=main.js.map
|
//# sourceMappingURL=main.js.map
|
||||||
|
|
||||||
|
@ -4620,8 +4619,8 @@ const util = __importStar(__webpack_require__(669));
|
||||||
const github = __importStar(__webpack_require__(824));
|
const github = __importStar(__webpack_require__(824));
|
||||||
const core = __importStar(__webpack_require__(470));
|
const core = __importStar(__webpack_require__(470));
|
||||||
const tc = __importStar(__webpack_require__(533));
|
const tc = __importStar(__webpack_require__(533));
|
||||||
let osPlat = os.platform();
|
const osPlat = os.platform();
|
||||||
let osArch = os.arch();
|
const osArch = os.arch();
|
||||||
function getUPX(version) {
|
function getUPX(version) {
|
||||||
return __awaiter(this, void 0, void 0, function* () {
|
return __awaiter(this, void 0, void 0, function* () {
|
||||||
const release = yield github.getRelease(version);
|
const release = yield github.getRelease(version);
|
||||||
|
@ -4629,7 +4628,6 @@ function getUPX(version) {
|
||||||
throw new Error(`Cannot find UPX ${version} release`);
|
throw new Error(`Cannot find UPX ${version} release`);
|
||||||
}
|
}
|
||||||
const semver = release.tag_name.replace(/^v/, '');
|
const semver = release.tag_name.replace(/^v/, '');
|
||||||
core.debug(`Semver is ${semver}`);
|
|
||||||
core.info(`✅ UPX version found: ${semver}`);
|
core.info(`✅ UPX version found: ${semver}`);
|
||||||
const filename = util.format('%s.%s', getName(semver), osPlat == 'win32' ? 'zip' : 'tar.xz');
|
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);
|
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);
|
const downloadPath = yield tc.downloadTool(downloadUrl);
|
||||||
core.debug(`Downloaded to ${downloadPath}`);
|
core.debug(`Downloaded to ${downloadPath}`);
|
||||||
core.info('📦 Extracting UPX...');
|
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}`);
|
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}`);
|
core.debug(`Cached to ${cachePath}`);
|
||||||
const exePath = path.join(cachePath, getName(semver), osPlat == 'win32' ? 'upx.exe' : 'upx');
|
const exePath = path.join(cachePath, getName(semver), osPlat == 'win32' ? 'upx.exe' : 'upx');
|
||||||
core.debug(`Exe path is ${exePath}`);
|
core.debug(`Exe path is ${exePath}`);
|
||||||
|
|
|
@ -7,5 +7,5 @@ module.exports = {
|
||||||
transform: {
|
transform: {
|
||||||
'^.+\\.ts$': 'ts-jest'
|
'^.+\\.ts$': 'ts-jest'
|
||||||
},
|
},
|
||||||
verbose: true
|
verbose: false
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,4 +39,4 @@
|
||||||
"typescript": "^3.8.3",
|
"typescript": "^3.8.3",
|
||||||
"typescript-formatter": "^7.2.2"
|
"typescript-formatter": "^7.2.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -5,17 +5,15 @@ import * as github from './github';
|
||||||
import * as core from '@actions/core';
|
import * as core from '@actions/core';
|
||||||
import * as tc from '@actions/tool-cache';
|
import * as tc from '@actions/tool-cache';
|
||||||
|
|
||||||
let osPlat: string = os.platform();
|
const osPlat: string = os.platform();
|
||||||
let osArch: string = os.arch();
|
const osArch: string = os.arch();
|
||||||
|
|
||||||
export async function getUPX(version: string): Promise<string> {
|
export async function getUPX(version: string): Promise<string> {
|
||||||
const release: github.GitHubRelease | null = await github.getRelease(version);
|
const release: github.GitHubRelease | null = await github.getRelease(version);
|
||||||
if (!release) {
|
if (!release) {
|
||||||
throw new Error(`Cannot find UPX ${version} release`);
|
throw new Error(`Cannot find UPX ${version} release`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const semver: string = release.tag_name.replace(/^v/, '');
|
const semver: string = release.tag_name.replace(/^v/, '');
|
||||||
core.debug(`Semver is ${semver}`);
|
|
||||||
|
|
||||||
core.info(`✅ UPX version found: ${semver}`);
|
core.info(`✅ UPX version found: ${semver}`);
|
||||||
const filename = util.format('%s.%s', getName(semver), osPlat == 'win32' ? 'zip' : 'tar.xz');
|
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.debug(`Downloaded to ${downloadPath}`);
|
||||||
|
|
||||||
core.info('📦 Extracting UPX...');
|
core.info('📦 Extracting UPX...');
|
||||||
const extPath: string =
|
let extPath: string;
|
||||||
osPlat == 'win32' ? await tc.extractZip(downloadPath) : await tc.extractTar(downloadPath, undefined, 'x');
|
if (osPlat == 'win32') {
|
||||||
|
extPath = await tc.extractZip(downloadPath);
|
||||||
|
} else {
|
||||||
|
extPath = await tc.extractTar(downloadPath, undefined, 'x');
|
||||||
|
}
|
||||||
core.debug(`Extracted to ${extPath}`);
|
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}`);
|
core.debug(`Cached to ${cachePath}`);
|
||||||
|
|
||||||
const exePath: string = path.join(cachePath, getName(semver), osPlat == 'win32' ? 'upx.exe' : 'upx');
|
const exePath: string = path.join(cachePath, getName(semver), osPlat == 'win32' ? 'upx.exe' : 'upx');
|
||||||
|
|
|
@ -4,7 +4,7 @@ import * as installer from './installer';
|
||||||
import * as core from '@actions/core';
|
import * as core from '@actions/core';
|
||||||
import * as exec from '@actions/exec';
|
import * as exec from '@actions/exec';
|
||||||
|
|
||||||
export async function run() {
|
async function run(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
if (os.platform() == 'darwin') {
|
if (os.platform() == 'darwin') {
|
||||||
core.setFailed('Not supported on darwin platform');
|
core.setFailed('Not supported on darwin platform');
|
||||||
|
|
Loading…
Reference in New Issue
Block a user