Actions: Use conditional to set bash.exe shell for Windows

rabix · Oct 2, 2020 · 72d2077 · 72d2077
1 parent 9c947a5
commit 72d2077
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         os:
           - macOS-latest
-          # - windows-2016
+          - windows-latest
           - ubuntu-18.04
 
     steps:
@@ -28,6 +28,12 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 14.x
+
+      - name: Set Windows shell
+        if: contains(matrix.os, 'windows')
+        run: |
+          npm config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
+
       - name: Install and build
         run: |
           npm ci          

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         os:
           - macOS-latest
-          #- windows-2016  #until we can figure out cross-platform command line
+          - windows-latest
           - ubuntu-18.04
 
     steps:
@@ -28,6 +28,12 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: 14.x
+
+      - name: Set Windows shell
+        if: contains(matrix.os, 'windows')
+        run: |
+          npm config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe"
+
       - name: Install, compile and test 
         run: |
           npm install