(#164) Use SCU build on GitHub Actions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 494cad22facfde3d373b0f405f27d0dd24f8ac1f..33895a8b18ef0d70cb6931ff1166bb2f5b39ef69 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,40 +5,26 @@ jobs:
   build-linux:
     runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1
-    - name: fetch ppa for cmake
-      run: |
-        wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add -
-        sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
-    - name: install dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -qq cmake libsdl2-dev libxml2-dev
-    - name: build nothing
-      # we need to hardcode this path, because whoever made this environment is overriding their version
-      # in PATH before /usr/bin. see: https://travis-ci.community/t/install-cmake-using-apt-again/4062
-      # (probably the same issue).
-      env:
-        CMAKE_PATH: /usr/bin/cmake
-      run: |
-        mkdir build
-        cd build
-        $CMAKE_PATH .. -DNOTHING_CI=ON
-        $CMAKE_PATH --build .
-        
+      - uses: actions/checkout@v1
+      - name: install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -qq libsdl2-dev 
+      - name: build nothing
+        run: |
+          ./build-posix.sh 
+
   build-macos:
     runs-on: macOS-10.14
     steps:
       - uses: actions/checkout@v1
       - name: install dependencies
-        run: brew install cmake sdl2
+        run: brew install sdl2
       - name: build nothing
         run: |
-          mkdir build
-          cd build
-          cmake .. -DNOTHING_CI=ON
-          cmake --build .
+          ./build-posix.sh
 
+  # TODO: build-windows-msvc on GitHub Actions does not support SCU
   build-windows-msvc:
     runs-on: windows-2019
     steps:
@@ -64,15 +50,7 @@ jobs:
         # this gives us msys.
       - uses: numworks/setup-msys2@v1
       - name: install dependencies
-        run: msys2do pacman -S --noconfirm mingw-w64-x86_64-gcc mingw64/mingw-w64-x86_64-SDL2 mingw64/mingw-w64-x86_64-SDL2_mixer mingw64/mingw-w64-x86_64-SDL2_image mingw64/mingw-w64-x86_64-SDL2_ttf mingw64/mingw-w64-x86_64-SDL2_net mingw64/mingw-w64-x86_64-cmake make
-
-        # make a script and run that, because people who write software in 2019 are incapable
-        # of passing quoted strings between programs.
+        run: msys2do pacman -S --noconfirm mingw-w64-x86_64-gcc mingw64/mingw-w64-x86_64-SDL2 make
       - name: build nothing
         run: |
-          mkdir build
-          cd build
-          Set-Content -Value 'cmake .. -G "MSYS Makefiles" -DNOTHING_CI=ON && cmake --build .' -Path dumb_workaround_file.sh
-          cat dumb_workaround_file.sh
-          msys2do chmod +x dumb_workaround_file.sh
-          msys2do ./dumb_workaround_file.sh
+          msys2do ./build-posix.sh

diff --git a/appveyor.yml b/appveyor.yml
index 8008ead0f40bf2bab19ebd03fd39dd7a53ac9181..3f2a9972af762d78507ed1dd2858423ffdb3c1a9 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,4 @@
+# TODO: Appveyor build does not support SCU 
 image:
   - ubuntu1804
   - Visual Studio 2015