Updated windows workflow

mrcoalp · Mar 13, 2021 · 04fc01c · 04fc01c
1 parent 491a763
commit 04fc01c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,10 +23,10 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        args: [ -d -t --mingw, -d -t --shared --mingw, -r -t --mingw, -r -t --shared --mingw ]
+        args: [ -r -t --mingw, -r -t --shared --mingw ]
     steps:
       - uses: actions/checkout@v2
-      - name: Build Debug
+      - name: Build
         run: platform-scripts\windows\build ${{ matrix.args }}
-      - name: Test Debug
+      - name: Test
         run: platform-scripts\windows\test ${{ matrix.args }}
diff --git a/platform-scripts/windows/build.bat b/platform-scripts/windows/build.bat
@@ -29,8 +29,8 @@ set generator="Visual Studio 16 2019"
     )
     mkdir build\%configuration%
     cd build\%configuration%
-    cmake ..\.. -G %generator% -DBUILD_SHARED_LIBS=%shared% -DMOON_BUILD_TESTS=%tests% -DMOON_BUILD_DOC=%doc% -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=./bin
-    cmake --build . --config %configuration% %install%
+    cmake ..\.. -G %generator% -DBUILD_SHARED_LIBS=%shared% -DMOON_BUILD_TESTS=%tests% -DMOON_BUILD_DOC=%doc% -DCMAKE_BUILD_TYPE=%configuration% -DCMAKE_INSTALL_PREFIX=./bin || exit 1
+    cmake --build . --config %configuration% %install% || exit 1
     cd ..\..
     goto end
 

diff --git a/platform-scripts/windows/test.bat b/platform-scripts/windows/test.bat
@@ -11,8 +11,8 @@ set configuration=Debug
     if not "%~1" == "" goto loop
 
 :test
-    cd build\%configuration%\test || goto end
-    %configuration%\moon_tst || moon_tst
+    cd build\%configuration%\test || exit 1
+    %configuration%\moon_tst || moon_tst || exit 1
     cd ..\..\..
     goto end