Commit 550b8377bc6a895d6b4ff2dd3c1566cadf45e119
2022-02-28T14:50:37
Combine the MSVC and UWP workflows
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 901c6a6..098c6a7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,11 +15,6 @@ jobs:
fail-fast: false
matrix:
platform:
- - { name: Windows (x64), os: windows-latest, shell: pwsh, flags: -A x64 }
- - { name: Windows (x86), os: windows-latest, shell: pwsh, flags: -A Win32 }
- - { name: Windows (clang-cl x64), os: windows-latest, shell: pwsh, flags: -T ClangCL -A x64 }
- - { name: Windows (clang-cl x86), os: windows-latest, shell: pwsh, flags: -T ClangCL -A Win32 }
- - { name: Windows (ARM64), os: windows-latest, shell: pwsh, flags: -A ARM64 }
- { name: Windows (mingw32), os: windows-latest, shell: 'msys2 {0}', msystem: mingw32, msys-env: mingw-w64-i686 }
- { name: Windows (mingw64), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64 }
- { name: Linux, os: ubuntu-20.04, shell: sh, flags: -GNinja }
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
new file mode 100644
index 0000000..1907bf1
--- /dev/null
+++ b/.github/workflows/msvc.yml
@@ -0,0 +1,27 @@
+name: Build (MSVC)
+
+on: [push, pull_request]
+
+jobs:
+ Build:
+ name: ${{ matrix.platform.name }}
+ runs-on: windows-latest
+
+ strategy:
+ fail-fast: false
+ matrix:
+ platform:
+ - { name: Windows (x64), flags: -A x64 }
+ - { name: Windows (x86), flags: -A Win32 }
+ - { name: Windows (clang-cl x64), flags: -T ClangCL -A x64 }
+ - { name: Windows (clang-cl x86), flags: -T ClangCL -A Win32 }
+ - { name: Windows (ARM64), flags: -A ARM64 }
+ - { name: UWP (x64), flags: -A x64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DSDL_TEST=OFF }
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Configure CMake
+ run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
+ - name: Build CMake
+ run: cmake --build build/ --config Release --parallel
+
diff --git a/.github/workflows/uwp.yml b/.github/workflows/uwp.yml
deleted file mode 100644
index 8a60def..0000000
--- a/.github/workflows/uwp.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Build (UWP)
-
-on: [push, pull_request]
-
-jobs:
- Build:
- name: UWP-x64
- runs-on: windows-latest
-
- steps:
- - uses: actions/checkout@v2
- - name: Configure
- run: mkdir build; cd build; cmake -Ax64 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0" -DCMAKE_BUILD_TYPE=Release ..
- - name: Build
- run: cd build; cmake --build .