From 23600171992090c32ed481d79abbe2912412004e Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 20 Sep 2021 20:55:27 -0600 Subject: [PATCH] Revert "ci: setup github actions on windows" This reverts commit b193a26bbfec4d6b640ca731e259ffbaed5b52d7. --- .github/workflows/cmake.yml | 7 +---- build-windows-64.ps1 | 59 ------------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 build-windows-64.ps1 diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index feba9c0d..6665cdea 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -13,7 +13,7 @@ jobs: # Don't cancel the macOS build if the Linux build fails, etc. fail-fast: false matrix: - os: [ubuntu-18.04, macos-10.15, windows-latest] + os: [ubuntu-18.04, macos-10.15] steps: - uses: actions/checkout@v2 @@ -30,8 +30,3 @@ jobs: if: runner.os == 'macOS' run: | ./build-osx.sh - - - name: Windows Build - if: runner.os == 'Windows' - run: | - powershell ./build-windows-64.ps1 diff --git a/build-windows-64.ps1 b/build-windows-64.ps1 deleted file mode 100644 index df5aea5b..00000000 --- a/build-windows-64.ps1 +++ /dev/null @@ -1,59 +0,0 @@ -# for Groff (needed to generate manual) -# see: https://github.com/actions/virtual-environments/blob/main/images/win/scripts/Installers/Install-Msys2.ps1 -$env:PATH += ";C:\msys64\mingw64\bin;C:\msys64\usr\bin" - -# For sha256sum -$env:Path += ";C:\Program Files\Git\usr\bin" - -# Fetch dependencies -Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v3.12.1/embree-3.12.1.x64.vc14.windows.zip' -OutFile 'embree64.zip' -7z x embree64.zip -oc:\ -Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip' -OutFile 'tbb.zip' -7z x tbb.zip -oc:\ - -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 - -$cmakePlatform = "x64" - -msbuild /target:testlight /p:Configuration=Release /p:Platform=$cmakePlatform ericw-tools.sln - -if ( $? -eq $false ) { - throw "testlight failed to build" -} - -msbuild /target:testqbsp /p:Configuration=Release /p:Platform=$cmakePlatform ericw-tools.sln - -if ( $? -eq $false ) { - throw "testqbsp failed to build" -} - -msbuild /p:Configuration=Release /p:Platform=$cmakePlatform 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" -}