From d81dc9f125b05a111f404c4005d9a977a541d066 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 28 Aug 2021 23:41:31 +0200
Subject: [PATCH] Remove tests for matrix.skip_gui in workflow files

This setting is used, so just remove all the tests for it.
---
 .github/workflows/ci.yml     | 8 +++-----
 .github/workflows/ci_mac.yml | 6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f2342ecc3e..2fcee94db3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -185,9 +185,7 @@ jobs:
       - name: Building tests
         working-directory: tests
         run: |
-          if [ !${{ matrix.skip_gui }} ]; then
-            make $wxBUILD_ARGS failtest
-          fi
+          make $wxBUILD_ARGS failtest
           make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
 
       - name: Testing
@@ -217,7 +215,7 @@ jobs:
           fi
 
       - name: Testing GUI using Xvfb
-        if: matrix.skip_gui != true && matrix.use_xvfb
+        if: matrix.use_xvfb
         working-directory: tests
         run: |
           if [ ${{ matrix.use_asan }} ]; then
@@ -247,7 +245,7 @@ jobs:
           fi
 
       - name: Building samples
-        if: matrix.skip_gui != true && matrix.skip_samples != true
+        if: matrix.skip_samples != true
         run: |
           make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples
 
diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml
index 02c0c5994a..0542f28ab5 100644
--- a/.github/workflows/ci_mac.yml
+++ b/.github/workflows/ci_mac.yml
@@ -182,9 +182,7 @@ jobs:
 
     - name: Building tests
       run: |
-        if [ !${{ matrix.skip_gui }} ]; then
-          make -C tests $wxBUILD_ARGS failtest
-        fi
+        make -C tests $wxBUILD_ARGS failtest
         make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
 
     - name: Testing
@@ -202,7 +200,7 @@ jobs:
         fi
 
     - name: Building samples
-      if: matrix.skip_testing != true && matrix.skip_gui != true && matrix.skip_samples != true
+      if: matrix.skip_testing != true && matrix.skip_samples != true
       run: |
         make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples