From d10d8b5314108b5a8f5c1567cf95302e4e005858 Mon Sep 17 00:00:00 2001 From: C02CR2E3ML85 Date: Mon, 5 Oct 2020 11:06:49 -0400 Subject: [PATCH] Action: Change shell path for x64 (windows) --- .github/workflows/build.yml | 8 ++++---- .github/workflows/tests.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 10d5ab91..21ef61f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: - name: Set Windows shell if: contains(matrix.os, 'windows') run: | - npm config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe" + npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe" - name: Install and build run: | @@ -44,21 +44,21 @@ jobs: # npx rimraf "dist/!(*.exe|*.deb|*.AppImage|*.dmg)" - name: Upload macOS artifacts - if: matrix.os == 'macOS-latest' + if: contains(matrix.os, 'macOS') uses: actions/upload-artifact@v1 with: name: ${{ matrix.os }} path: build/mac - name: Upload win artifacts - if: matrix.os == 'windows-2016' + if: contains(matrix.os, 'windows') uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }} path: build/*.exe - name: Upload linux artifacts - if: matrix.os == 'ubuntu-18.04' + if: contains(matrix.os, 'ubuntu') uses: actions/upload-artifact@v2 with: name: ${{ matrix.os }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ecc2d52c..4538fe8a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,7 @@ jobs: - name: Set Windows shell if: contains(matrix.os, 'windows') run: | - npm config set script-shell "C:\\Program Files (x86)\\git\\bin\\bash.exe" + npm config set script-shell "C:\\Program Files\\git\\bin\\bash.exe" - name: Install, compile and test run: |