From 6d91dc9e10a320c3fcce679cc2b4d8b4ebfb7823 Mon Sep 17 00:00:00 2001
From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
Date: Mon, 30 Aug 2021 13:13:00 +0200
Subject: [PATCH] treat GitHub Actions CI like travis CI and merge windows
 builds

---
 .github/workflows/ci.yaml | 5 +----
 test.cmake                | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index acac5b2f3..8791e0496 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -67,13 +67,10 @@ jobs:
 
   build-windows:
     runs-on: ${{ matrix.os }}
-    env:
-      subset: ${{ matrix.subset }}
-    name: build-${{ matrix.os }}-${{ matrix.subset }}
+    name: build-${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        subset: [sse, avx]
         os: [windows-2016] # , windows-2019
     steps:
     - uses: actions/checkout@v2
diff --git a/test.cmake b/test.cmake
index 511277dd7..9ff5d6cdd 100755
--- a/test.cmake
+++ b/test.cmake
@@ -107,10 +107,13 @@ endif()
 # determine the (short) hostname of the build machine
 ################################################################################
 set(travis_os $ENV{TRAVIS_OS_NAME})
+set(github_ci $ENV{GITHUB_ACTIONS})
 if(travis_os)
    set(CTEST_SITE "Travis CI")
 elseif(appveyor)
    set(CTEST_SITE "AppVeyor CI")
+elseif(github_ci)
+   set(CTEST_SITE "GitHub Actions")
 else()
    execute_process(COMMAND hostname -s RESULT_VARIABLE ok OUTPUT_VARIABLE CTEST_SITE ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
    if(NOT ok EQUAL 0)
@@ -434,7 +437,7 @@ macro(go)
       unset(CTEST_NOTES_FILES) # less clutter in ctest -V output
       if(res EQUAL 0)
          set(test_results 0)
-         if(travis_os)
+         if(travis_os OR github_ci)
             set(CTEST_BUILD_COMMAND "${CMAKE_MAKE_PROGRAM} ${MAKE_ARGS}")
             ctest_build(
                BUILD "${CTEST_BINARY_DIRECTORY}"