From c4bd4fd678eafb1677de1d078a0b730271502404 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Mon, 7 Nov 2022 01:28:54 +0100
Subject: [PATCH] merge test into main workflow

---
 .github/workflows/cmake.yml | 19 +++++++++++-----
 .github/workflows/test.yml  | 45 -------------------------------------
 2 files changed, 14 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 01471fa..fbf1bd3 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -29,7 +29,7 @@ jobs:
     # TODO: cache
 
     - name: Install Dependencies
-      run: sudo apt update && sudo apt -y install libsdl2-dev
+      run: sudo apt update && sudo apt -y install libsdl2-dev xserver-xorg-video-dummy
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
@@ -37,11 +37,20 @@ jobs:
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4
 
-    #- name: Test
-      #working-directory: ${{github.workspace}}/build
-      ## Execute tests defined by the CMake configuration.
-      ## See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+    - name: Test
+      working-directory: ${{github.workspace}}/build
+      # Execute tests defined by the CMake configuration.
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
       #run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure
+      # TODO: look into xinit
+      env:
+        DISPLAY: :0
+      run: |
+        sudo Xorg :0 -config ${{github.workspace}}/.github/workflows/x/dummy-1920x1080.conf -noautoBindGPU &
+        sleep 20s
+        ctest --output-on-failure --timeout 20
+        sudo pkill -15 Xorg
+
 
   linux_gles:
     timeout-minutes: 10
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 91f26e7..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Tests
-
-on:
-  - push
-  - workflow_dispatch
-
-jobs:
-  linux_tests:
-    timeout-minutes: 10
-
-    # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
-    # You can convert this to a matrix build if you need cross-platform coverage.
-    # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    # TODO: cache
-
-    - name: Install Dependencies
-      run: sudo apt update && sudo apt -y install libsdl2-dev xserver-xorg-video-dummy
-
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --config Debug -j 4
-
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      ## Execute tests defined by the CMake configuration.
-      ## See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      #run: ctest -C ${{env.BUILD_TYPE}} --output-on-failure
-      # TODO: look into xinit
-      env:
-        DISPLAY: :0
-      run: |
-        sudo Xorg :0 -config ${{github.workspace}}/.github/workflows/x/dummy-1920x1080.conf -noautoBindGPU &
-        sleep 20s
-        ctest --output-on-failure --timeout 20
-        sudo pkill -15 Xorg
-