Revision: 76819
          http://sourceforge.net/p/brlcad/code/76819
Author:   starseeker
Date:     2020-08-17 17:34:42 +0000 (Mon, 17 Aug 2020)
Log Message:
-----------
Not ready for Ninja yet, go with just a make all/check rather than distcheck

Modified Paths:
--------------
    brlcad/trunk/misc/repoconv/github_ci_actions.yml

Modified: brlcad/trunk/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/trunk/misc/repoconv/github_ci_actions.yml    2020-08-17 15:19:51 UTC 
(rev 76818)
+++ brlcad/trunk/misc/repoconv/github_ci_actions.yml    2020-08-17 17:34:42 UTC 
(rev 76819)
@@ -31,11 +31,6 @@
     #  Define a matrix of the operating system and compiler combinations
     #  we want to build against.
     #
-    #  Note that for Windows the vcvars64.bat script is important - that
-    #  is what sets up environment variables to make sure we get the 64
-    #  bit version of the compiler and libraries.  See:
-    #  https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line
-    #
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     strategy:
@@ -71,13 +66,8 @@
     #  so the script recognizes when it is in that environment and
     #  operates accordingly.
     #
-    #  We use https://github.com/marketplace/actions/install-ninja-build-tool
-    #  to set up and use the Ninja build tool on the runner, rather than using
-    #  make or msbuild.
-    #
     steps:
     - uses: actions/checkout@v1
-    - uses: seanmiddleditch/gha-setup-ninja@master
 
     - name: Configure
       shell: cmake -P {0}
@@ -107,9 +97,8 @@
         execute_process(
           COMMAND cmake
             -S .
-            -G Ninja
             -B build
-            -D CMAKE_BUILD_TYPE=$ENV{BUILD_TYPE}
+            -D CMAKE_BUILD_TYPE=Release
             -D CMAKE_VERBOSE_DISTCHECK=ON
           RESULT_VARIABLE result
         )
@@ -152,7 +141,8 @@
            )
         else ("${{ runner.os }}" STREQUAL "Windows")
            execute_process(
-             COMMAND cmake --build build --config Release --target distcheck
+             COMMAND cmake --build build --config Release --target all
+             COMMAND cmake --build build --config Release --target check
              RESULT_VARIABLE result
            )
         endif ("${{ runner.os }}" STREQUAL "Windows")

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to