Grab one other trunk file that slipped through the cracks.

svn:revision:77149 svn:branch:RELEASE svn:account:starseeker
BRL-CAD · Sep 14, 2020 · 2da7ac6 · 2da7ac6
1 parent 64929a3
commit 2da7ac6
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/misc/repoconv/github_ci_actions.yml b/misc/repoconv/github_ci_actions.yml
@@ -50,7 +50,7 @@ jobs:
           }
         - {
             name: "Ubuntu Latest GCC", artifact: "Linux.tar.xz",
-            os: ubuntu-latest,
+            os: ubuntu-20.04,
             cc: "gcc", cxx: "g++"
           }
         - {
@@ -73,6 +73,8 @@ jobs:
     #
     steps:
     - uses: actions/checkout@v1
+    - uses: lukka/get-cmake@latest
+    - uses: seanmiddleditch/gha-setup-ninja@master
 
     - name: Configure
       shell: cmake -P {0}
@@ -99,14 +101,28 @@ jobs:
         endif()
         set(ENV{PATH} "$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}")
 
+        if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{ matrix.config.environment_script }}" STREQUAL "x")
+        execute_process(
+          COMMAND cmake
+            -S .
+            -B build
+            -D ENABLE_ALL=ON
+            -D CMAKE_BUILD_TYPE=Release
+            -D CMAKE_VERBOSE_DISTCHECK=ON
+          RESULT_VARIABLE result
+        )
+        else()
         execute_process(
           COMMAND cmake
             -S .
+            -G Ninja
             -B build
+            -D ENABLE_ALL=ON
             -D CMAKE_BUILD_TYPE=Release
             -D CMAKE_VERBOSE_DISTCHECK=ON
           RESULT_VARIABLE result
         )
+        endif()
         if (NOT result EQUAL 0)
           message(FATAL_ERROR "Bad exit status")
         endif()
@@ -140,14 +156,14 @@ jobs:
 
         if ("${{ runner.os }}" STREQUAL "Windows")
            execute_process(
-             COMMAND cmake --build build --config Release --target ALL_BUILD
-             COMMAND cmake --build build --config Release --target check
+             COMMAND cmake --build build -j 1 --config Release --target ALL_BUILD
+             COMMAND cmake --build build -j 1 --config Release --target check
              RESULT_VARIABLE result
            )
         else ("${{ runner.os }}" STREQUAL "Windows")
            execute_process(
-             COMMAND cmake --build build --config Release --target all
-             COMMAND cmake --build build --config Release --target check
+             COMMAND cmake --build build --verbose --config Release --target all
+             COMMAND cmake --build build --verbose --config Release --target check
              RESULT_VARIABLE result
            )
         endif ("${{ runner.os }}" STREQUAL "Windows")