Merge pull request #229 from dscho/support-msys

Support MSYS mode

Author: dscho

.eslintrc.json

@@ -9,6 +9,7 @@
     },
     "rules": {
       "eslint-comments/no-use": "off",
+      "filenames/match-regex": [2, "^[a-z_]+(\\.test)?$", true],
       "import/no-namespace": "off",
       "no-unused-vars": "off",
       "@typescript-eslint/no-unused-vars": "off",

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
         shell: bash
         run: |
           # `ncc` produces output with mixed line endings
-          test -z "$(git diff -aw HEAD | tee diff.txt)" || {
+          test -z "$(git diff -aw HEAD -- ':(exclude)dist/index.js.map' | tee diff.txt)" || {
             echo 'Files changed after `npm run package`'
             cat diff.txt
             exit 1

README.md

@@ -70,7 +70,7 @@ By default, this Action prints a line whenever 250 items were extracted (this do
 
 To accelerate this Action, artifacts are cached once downloaded. This can be turned off by setting the input parameter `cache` to `false`.
 
-In practice, caching the `full` artifacts does not provide much of a speed-up. Instead, it slows it down by adding several minutes during with the artifact is cached. Therefore, caching is disabled for the `full` artifacts by default, corresponding to `cache: auto`.
+In practice, caching the `full` artifacts does not provide much of a speed-up. Instead, it slows it down by spending extra minutes on caching the artifact. Therefore, caching is disabled for the `full` artifacts by default, corresponding to `cache: auto`.
 
 ## Developing _this_ Action
 

__tests__/downloader.test.ts

@@ -1,6 +1,6 @@
+import fetch from 'node-fetch'
 import {get} from '../src/downloader'
 import {mocked} from 'ts-jest/utils'
-import fetch from 'node-fetch'
 
 const buildIdResponse = {
   count: 1,
@@ -19,8 +19,7 @@ const buildIdResponse = {
       queueTime: '2021-02-16T03:11:20.8026424Z',
       startTime: '2021-02-16T03:11:35.5385517Z',
       finishTime: '2021-02-16T03:42:07.4413436Z',
-      url:
-        'https://dev.azure.com/Git-for-Windows/f3317b6a-fa67-40d4-9a33-b652e06943df/_apis/build/Builds/71000',
+      url: 'https://dev.azure.com/Git-for-Windows/f3317b6a-fa67-40d4-9a33-b652e06943df/_apis/build/Builds/71000',
       definition: [Object],
       project: [Object],
       uri: 'vstfs:///Build/Build/71000',

__tests__/main.test.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
-import {statSync} from 'fs'
-import * as process from 'process'
 import * as child_process from 'child_process'
 import * as path from 'path'
+import * as process from 'process'
+import {statSync} from 'fs'
 
 async function runAction(
   options?: child_process.SpawnOptionsWithoutStdio

action.yml

@@ -13,6 +13,10 @@ inputs:
     required: false
     description: 'The architecture of the SDK: x86_64 or i686'
     default: 'x86_64'
+  msys:
+    required: false
+    description: 'Whether to start in MSYS mode (defaults to false)'
+    default: 'false'
   path:
     required: false
     description: 'Where to write the SDK files'

dist/index.js

@@ -1,7 +1,7 @@
 import * as core from '@actions/core'
-import process from 'process'
-import {get} from './src/downloader'
 import {restoreCache, saveCache} from '@actions/cache'
+import {get} from './src/downloader'
+import process from 'process'
 
 async function run(): Promise<void> {
   try {
@@ -14,6 +14,7 @@ async function run(): Promise<void> {
     const flavor = core.getInput('flavor')
     const architecture = core.getInput('architecture')
     const verbose = core.getInput('verbose')
+    const msysMode = core.getInput('msys') === 'true'
 
     const {artifactName, download, id} = await get(flavor, architecture)
     const outputDirectory = core.getInput('path') || `C:/${artifactName}`
@@ -58,11 +59,19 @@ async function run(): Promise<void> {
       }
     }
 
-    // Set up PATH so that Git for Windows' SDK's `bash.exe`, `prove` and `gcc` are found
-    core.addPath(`${outputDirectory}/usr/bin/core_perl`)
-    core.addPath(`${outputDirectory}/usr/bin`)
-    const msystem = architecture === 'i686' ? 'MINGW32' : 'MINGW64'
-    core.addPath(`${outputDirectory}/${msystem.toLocaleLowerCase()}/bin`)
+    const mingw = architecture === 'i686' ? 'MINGW32' : 'MINGW64'
+    const msystem = msysMode ? 'MSYS' : mingw
+
+    const binPaths = [
+      // Set up PATH so that Git for Windows' SDK's `bash.exe`, `prove` and `gcc` are found
+      '/usr/bin/core_perl',
+      '/usr/bin',
+      `/${mingw.toLocaleLowerCase()}/bin`
+    ]
+    for (const binPath of msysMode ? binPaths.reverse() : binPaths) {
+      core.addPath(`${outputDirectory}${binPath}`)
+    }
+
     core.exportVariable('MSYSTEM', msystem)
     if (
       !('LANG' in process.env) &&

dist/index.js.map

@@ -1,10 +1,10 @@
-import fs from 'fs'
-import https from 'https'
 import {Readable} from 'stream'
-import unzipper from 'unzipper'
-import {spawn} from 'child_process'
 import {delimiter} from 'path'
 import fetch from '@adobe/node-fetch-retry'
+import fs from 'fs'
+import https from 'https'
+import {spawn} from 'child_process'
+import unzipper from 'unzipper'
 
 const gitForWindowsUsrBinPath = 'C:/Program Files/Git/usr/bin'
 const gitForWindowsMINGW64BinPath = 'C:/Program Files/Git/mingw64/bin'
@@ -27,7 +27,7 @@ function mkdirp(directoryPath: string): void {
     }
     throw new Error(`${directoryPath} exists, but is not a directory`)
   } catch (e) {
-    if (!(e instanceof Object) || (e as any).code !== 'ENOENT') {
+    if (!(e instanceof Object) || (e as {code: string}).code !== 'ENOENT') {
       throw e
     }
   }