Build script upgrades (#3)

google · Jan 20, 2020 · b6a65cd · b6a65cd
1 parent 793b237
commit b6a65cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,8 +27,8 @@ jobs:
       matrix:
         os:
          - ubuntu-16.04
-         - windows-2016
-         - macOS-10.14
+         - windows-latest
+         - macOS-latest
         config:
           - Debug
           - Release
@@ -55,7 +55,7 @@ jobs:
           !startsWith(matrix.os, 'windows')
       - name: build_step_windows
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+          call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
           "C:\Program Files\Git\bin\bash.EXE" --noprofile --norc -e -o pipefail build.sh
         shell: cmd
         if: |

diff --git a/build.sh b/build.sh
@@ -20,6 +20,8 @@ set -u
 
 WORK="$(pwd)"
 
+help | head
+
 uname
 
 case "$(uname)" in
@@ -34,7 +36,7 @@ case "$(uname)" in
   brew install md5sha1sum
   ;;
 
-"MINGW"*)
+"MINGW"*|"MSYS_NT"*)
   GH_RELEASE_TOOL_ARCH="windows_amd64"
   BUILD_PLATFORM="Windows_x64"
   choco install zip