Revision: 77201
http://sourceforge.net/p/brlcad/code/77201
Author: starseeker
Date: 2020-09-23 17:59:23 +0000 (Wed, 23 Sep 2020)
Log Message:
-----------
See if we get fewer intermittent build failures on the VMs with default tools
instead of Ninja
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 14:54:39 UTC
(rev 77200)
+++ brlcad/trunk/misc/repoconv/github_ci_actions.yml 2020-09-23 17:59:23 UTC
(rev 77201)
@@ -74,7 +74,6 @@
steps:
- uses: actions/checkout@v2
- uses: lukka/get-cmake@latest
- - uses: seanmiddleditch/gha-setup-ninja@master
- name: Configure
shell: cmake -P {0}
@@ -82,10 +81,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)
@@ -100,8 +99,6 @@
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 .
@@ -111,17 +108,6 @@
-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")
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
