Ensure we exit if the first build pass fails

terrafx · Aug 6, 2020 · 5c79d18 · 5c79d18
1 parent b7e89a1
commit 5c79d18
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,12 +16,6 @@ jobs:
         os: [ windows ]
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-        source-url: https://pkgs.terrafx.dev/index.json
-      env:
-        NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }}
       shell: cmd
     - uses: actions/upload-artifact@v2
@@ -42,12 +36,6 @@ jobs:
         os: [ macos, ubuntu ]
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '3.1.x'
-        source-url: https://pkgs.terrafx.dev/index.json
-      env:
-        NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
       shell: bash
     - uses: actions/upload-artifact@v2

diff --git a/scripts/cibuild.cmd b/scripts/cibuild.cmd
@@ -1,4 +1,5 @@
 @ECHO OFF
 powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0build.ps1""" -ci %*"
+IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
 powershell.exe -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0build.ps1""" -ci -solution """%~dp0..\TerraFX.Interop.Windows.Samples.sln""" %*"
 EXIT /B %ERRORLEVEL%