Revision: 77205
http://sourceforge.net/p/brlcad/code/77205
Author: starseeker
Date: 2020-09-23 22:31:52 +0000 (Wed, 23 Sep 2020)
Log Message:
-----------
Looks like the real issue is we can't build parallel safely - the runner I/O
doesn't complete reliably when we do. Re-enable Ninja, but do it single
threaded.
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-09-23 22:30:50 UTC
(rev 77204)
+++ brlcad/trunk/misc/repoconv/github_ci_actions.yml 2020-09-23 22:31:52 UTC
(rev 77205)
@@ -74,6 +74,7 @@
steps:
- uses: actions/checkout@v2
- uses: lukka/get-cmake@latest
+ - uses: seanmiddleditch/gha-setup-ninja@master
- name: Configure
shell: cmake -P {0}
@@ -81,10 +82,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)
@@ -99,6 +100,8 @@
set(path_separator ";")
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 .
@@ -108,6 +111,17 @@
-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")
@@ -148,8 +162,8 @@
)
else ("${{ runner.os }}" STREQUAL "Windows")
execute_process(
- COMMAND cmake --build build --verbose --config Release --target
all
- COMMAND cmake --build build --verbose --config Release --target
check
+ COMMAND cmake --build build -j 1 --verbose --config Release
--target all
+ COMMAND cmake --build build -j 1 --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
