Revision: 76801
http://sourceforge.net/p/brlcad/code/76801
Author: starseeker
Date: 2020-08-16 17:23:40 +0000 (Sun, 16 Aug 2020)
Log Message:
-----------
Main build isn't ready yet, but see if we can use Ninja for building on all
platforms.
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-16 17:21:53 UTC
(rev 76800)
+++ brlcad/trunk/misc/repoconv/github_ci_actions.yml 2020-08-16 17:23:40 UTC
(rev 76801)
@@ -66,8 +66,13 @@
# 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}
@@ -75,10 +80,10 @@
set(ENV{CC} ${{ matrix.config.cc }})
set(ENV{CXX} ${{ matrix.config.cxx }})
- if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{
matrix.config.environment_script }}" STREQUAL "x")
+ if ("${{ runner.os }}" STREQUAL "Windows" AND NOT "x${{
matrix.config.environment_script }}" STREQUAL "x")
execute_process(
- COMMAND "${{ matrix.config.environment_script }}" && set
- OUTPUT_FILE environment_script_output.txt
+ COMMAND "${{ matrix.config.environment_script }}" && set
+ OUTPUT_FILE environment_script_output.txt
)
file(STRINGS environment_script_output.txt output_lines)
foreach(line IN LISTS output_lines)
@@ -97,6 +102,7 @@
execute_process(
COMMAND cmake
-S .
+ -G Ninja
-B build
-D CMAKE_BUILD_TYPE=$ENV{BUILD_TYPE}
-D CMAKE_VERBOSE_DISTCHECK=ON
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
