ci: move appveyor build to separate .ps1 script

to suppress failing on writes to stderr. see: https://help.appveyor.com/discussions/problems/10014-false-build-fail-status
2021-09-19 23:26:27 -06:00 · 2021-09-19 23:26:27 -06:00 · ba7fbbb69b
parent d453ff6c01
commit ba7fbbb69b
2 changed files with 55 additions and 55 deletions
--- a/appveyor.yml
+++ b/appveyor.yml
@ -10,61 +10,7 @@ install:
 - ps: Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip' -OutFile 'tbb.zip'
 - ps: 7z x tbb.zip -oc:\
 build_script:
- ps: >-
-    git submodule update --init --recursive
-
-    $env:Path += ";C:\cygwin64\bin"
-
-    # For sha256sum
-    $env:Path += ";C:\Program Files\Git\usr\bin"
-
-    mkdir cmakebuild
-
-    cd cmakebuild
-
-    cmake .. -T v142 -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
-
-    $cmakePlatform = "x64"
-
-    msbuild /target:testlight /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ericw-tools.sln
-
-    if ( $? -eq $false ) {
-      throw "testlight failed to build"
-    }
-
-    msbuild /target:testqbsp /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ericw-tools.sln
-
-    if ( $? -eq $false ) {
-      throw "testqbsp failed to build"
-    }
-
-    msbuild /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" PACKAGE.vcxproj
-
-    if ( $? -eq $false ) {
-      throw "package failed"
-    }
-
-    .\light\Release\testlight.exe
-
-    if ( $? -eq $false ) {
-      throw "testlight failed"
-    }
-
-    .\qbsp\Release\testqbsp.exe
-
-    if ( $? -eq $false ) {
-      throw "testqbsp failed"
-    }
-
-    $env:Path += ";$(pwd)\qbsp\Release;$(pwd)\vis\Release;$(pwd)\light\Release"
-
-    cd ..\testmaps
-
-    . "C:\Program Files\Git\usr\bin\bash.exe" .\automatated_tests.sh
-
-    if ( $LastExitCode -ne 0 ) {
-      throw "automatated_tests.sh failed"
-    }
+- cmd: powershell .\build-appveyor.ps1
 artifacts:
 - path: cmakebuild\*.zip
 deploy:
--- a/build-appveyor.ps1
+++ b/build-appveyor.ps1
@ -0,0 +1,54 @@
+git submodule update --init --recursive
+
+$env:Path += ";C:\cygwin64\bin"
+
+# For sha256sum
+$env:Path += ";C:\Program Files\Git\usr\bin"
+
+mkdir cmakebuild
+
+cd cmakebuild
+
+cmake .. -T v142 -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
+
+$cmakePlatform = "x64"
+
+msbuild /target:testlight /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ericw-tools.sln
+
+if ( $? -eq $false ) {
+  throw "testlight failed to build"
+}
+
+msbuild /target:testqbsp /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" ericw-tools.sln
+
+if ( $? -eq $false ) {
+  throw "testqbsp failed to build"
+}
+
+msbuild /p:Configuration=Release /p:Platform=$cmakePlatform /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" PACKAGE.vcxproj
+
+if ( $? -eq $false ) {
+  throw "package failed"
+}
+
+.\light\Release\testlight.exe
+
+if ( $? -eq $false ) {
+  throw "testlight failed"
+}
+
+.\qbsp\Release\testqbsp.exe
+
+if ( $? -eq $false ) {
+  throw "testqbsp failed"
+}
+
+$env:Path += ";$(pwd)\qbsp\Release;$(pwd)\vis\Release;$(pwd)\light\Release"
+
+cd ..\testmaps
+
+. "C:\Program Files\Git\usr\bin\bash.exe" .\automatated_tests.sh
+
+if ( $LastExitCode -ne 0 ) {
+  throw "automatated_tests.sh failed"
+}