Refactor to support Windows

Author: swinton

Diff for: .github/workflows/test.yml

@@ -1,14 +1,22 @@
 name: Tests
 
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+    - main
+  pull_request:
+
+defaults:
+  run:
+    shell: bash
 
 jobs:
   test:
     name: Test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest, windows-2016, ubuntu-18.04]
+        os: [macos-latest, windows-latest, ubuntu-latest]
         version: [1.1.0, 1.0.0]
     steps:
     - name: Checkout
@@ -19,4 +27,19 @@ jobs:
       with:
         version: ${{ matrix.version }}
 
-    - run: gh --version
+    - name: Capture gh version installed
+      run: |
+        export GH_VERSION=$( gh --version )
+        echo 'GH_VERSION_INSTALLED<<EOF' >> $GITHUB_ENV
+        gh --version >> $GITHUB_ENV
+        echo 'EOF' >> $GITHUB_ENV
+
+    - name: Verify
+      shell: python
+      env:
+        GH_VERSION_EXPECTED: ${{ matrix.version }}
+      run: |
+        import sys, os
+        sys.exit(
+            int(not os.environ["GH_VERSION_EXPECTED"] in os.environ["GH_VERSION_INSTALLED"])
+        )

Diff for: dist/index.js

@@ -1,29 +1,30 @@
 const path = require('path');
 const core = require('@actions/core');
 const tc = require('@actions/tool-cache');
-const { getDownloadURL } = require('./lib/utils');
+const { getDownloadObject } = require('./lib/utils');
 
 async function setup() {
-  // Get version of tool to be installed
-  const version = core.getInput('version');
+  try {
+    // Get version of tool to be installed
+    const version = core.getInput('version');
 
-  // Download the specific version of the tool, e.g. as a tarball
-  const downloadURL = getDownloadURL(version);
-  const pathToTarball = await tc.downloadTool(downloadURL.url);
+    // Download the specific version of the tool, e.g. as a tarball/zipball
+    const download = getDownloadObject(version);
+    const pathToTarball = await tc.downloadTool(download.url);
 
-  // Extract the tarball onto host runner
-  const pathToCLI = await tc.extractTar(pathToTarball);
+    // Extract the tarball/zipball onto host runner
+    const extract = download.url.endsWith('.zip') ? tc.extractZip : tc.extractTar;
+    const pathToCLI = await extract(pathToTarball);
 
-  // Expose the tool by adding it to the PATH
-  core.addPath(path.join(pathToCLI, downloadURL.filename, 'bin'));
+    // Expose the tool by adding it to the PATH
+    core.addPath(path.join(pathToCLI, download.binPath));
+  } catch (e) {
+    core.setFailed(e);
+  }
 }
 
 module.exports = setup
 
 if (require.main === module) {
-  try {
-    setup();
-  } catch (e) {
-    core.error(e);
-  }
+  setup();
 }

Diff for: dist/index.js.map

@@ -1,4 +1,5 @@
 const os = require('os');
+const path = require('path');
 
 // arch in [arm, x32, x64...] (https://nodejs.org/api/os.html#os_os_arch)
 // return value in [amd64, 386, arm]
@@ -20,13 +21,16 @@ function mapOS(os) {
   return mappings[os] || os;
 }
 
-function getDownloadURL(version) {
-  const filename = `gh_${ version }_${ mapOS(os.platform()) }_${ mapArch(os.arch()) }`;
-  const url = `https://github.com/cli/cli/releases/download/v${ version }/${ filename }.tar.gz`;
+function getDownloadObject(version) {
+  const platform = os.platform();
+  const filename = `gh_${ version }_${ mapOS(platform) }_${ mapArch(os.arch()) }`;
+  const extension = platform === 'win32' ? 'zip' : 'tar.gz';
+  const binPath = platform === 'win32' ? 'bin' : path.join(filename, 'bin');
+  const url = `https://github.com/cli/cli/releases/download/v${ version }/${ filename }.${ extension }`;
   return {
     url,
-    filename
+    binPath
   };
 }
 
-module.exports = { getDownloadURL }
+module.exports = { getDownloadObject }