Revision: 76958
http://sourceforge.net/p/brlcad/code/76958
Author: starseeker
Date: 2020-08-26 12:12:42 +0000 (Wed, 26 Aug 2020)
Log Message:
-----------
Use Ninja where we can.
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-26 11:54:36 UTC
(rev 76957)
+++ brlcad/trunk/misc/repoconv/github_ci_actions.yml 2020-08-26 12:12:42 UTC
(rev 76958)
@@ -50,7 +50,7 @@
}
- {
name: "Ubuntu Latest GCC", artifact: "Linux.tar.xz",
- os: ubuntu-latest,
+ os: ubuntu-20.04,
cc: "gcc", cxx: "g++"
}
- {
@@ -73,6 +73,8 @@
#
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 @@
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 @@
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")
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
