Update CHANGELOG

.github/workflows/test.yml

@@ -22,17 +22,9 @@ jobs:
         # https://github.com/actions/checkout
         name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Build
-        run: |
-          npm install
-          npm run build
       -
         name: Install
-        run: npm ci
+        run: npm install
-      -
-        name: Build
-        run: npm run build
       -
         name: Test
         run: npm run test

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.1 (2020/05/07)
+
+* Code cleanup
+
 ## 1.3.0 (2020/05/06)
 
 * Use native tools

README.md

@@ -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      |
 

__tests__/github.test.ts

@@ -1,8 +1,16 @@
 import * as github from '../src/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?.tag_name).toEqual('v3.96');
   });

__tests__/installer.test.ts

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

dist/index.js

@@ -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();
+const osPlat = os.platform();
-let osArch = os.arch();
+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}`);
@@ -4692,7 +4696,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const httpm = __importStar(__webpack_require__(539));
 exports.getRelease = (version) => __awaiter(void 0, void 0, void 0, function* () {
-    const url = `https://github.com/upx/upx/releases/${version !== 'latest' ? `v${version}` : version}`;
+    const url = `https://github.com/upx/upx/releases/${version}`;
     const http = new httpm.HttpClient('ghaction-upx');
     return (yield http.getJson(url)).result;
 });

jest.config.js

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

package.json

@@ -7,7 +7,8 @@
     "test": "jest --coverage",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts",
-    "pre-checkin": "npm run format && npm run build"
+    "cleanup-paths": "removeNPMAbsolutePaths ./ --force --fields _where _args",
+    "pre-checkin": "npm run format && npm run cleanup-paths && npm run build"
   },
   "repository": {
     "type": "git",
@@ -27,13 +28,14 @@
   },
   "devDependencies": {
     "@types/jest": "^25.2.1",
-    "@types/node": "^13.13.4",
+    "@types/node": "^13.13.5",
     "@zeit/ncc": "^0.22.1",
-    "jest": "^25.5.0",
+    "jest": "^25.5.4",
-    "jest-circus": "^25.5.0",
+    "jest-circus": "^25.5.4",
-    "jest-runtime": "^25.5.0",
+    "jest-runtime": "^25.5.4",
     "prettier": "^2.0.5",
-    "ts-jest": "^25.4.0",
+    "removeNPMAbsolutePaths": "^2.0.0",
+    "ts-jest": "^25.5.0",
     "typescript": "^3.8.3",
     "typescript-formatter": "^7.2.2"
   }

src/github.ts

@@ -6,7 +6,7 @@ export interface GitHubRelease {
 }
 
 export const getRelease = async (version: string): Promise<GitHubRelease | null> => {
-  const url: string = `https://github.com/upx/upx/releases/${version !== 'latest' ? `v${version}` : version}`;
+  const url: string = `https://github.com/upx/upx/releases/${version}`;
   const http: httpm.HttpClient = new httpm.HttpClient('ghaction-upx');
   return (await http.getJson<GitHubRelease>(url)).result;
 };

src/installer.ts

@@ -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();
+const osPlat: string = os.platform();
-let osArch: string = os.arch();
+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 =
+  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}`);
 
-  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');

src/main.ts

@@ -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');