Skip to content

Commit 41a66fb

Browse files
authored
Merge pull request #1870 from DARMA-tasking/1869-avoid-testing-when-gitlab-ci-build-fails
1869 Avoid testing when gitlab CI build fails
2 parents eb4f144 + ac8a644 commit 41a66fb

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

ci/ctest_job_script.cmake

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,19 +143,23 @@ set(configureOpts
143143
"-DCMAKE_JOB_POOL_COMPILE='default_pool'"
144144
"-DCMAKE_JOB_POOL_LINK='default_pool'"
145145
)
146-
ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
146+
#ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
147147
ctest_start(Continuous)
148-
ctest_configure(OPTIONS "${configureOpts}")
148+
ctest_configure(OPTIONS "${configureOpts}" RETURN_VALUE ret_conf)
149149
ctest_submit(PARTS Start Configure)
150-
ctest_build()
151-
ctest_submit(PARTS Build)
150+
if (NOT ret_conf)
151+
ctest_build(RETURN_VALUE ret_build)
152+
ctest_submit(PARTS Build)
152153
# ctest_upload(FILES
153154
# ${CTEST_BINARY_DIRECTORY}/mytest.log
154155
# ${CTEST_BINARY_DIRECTORY}/anotherFile.txt
155156
# )
156157
# ctest_submit(PARTS Upload Submit)
157-
ctest_test(PARALLEL_LEVEL $ENV{parallel_level})
158-
ctest_submit(PARTS Test)
158+
if (NOT ret_build)
159+
ctest_test(PARALLEL_LEVEL $ENV{parallel_level})
160+
ctest_submit(PARTS Test)
161+
endif()
162+
endif()
159163
if(NOT CMAKE_VERSION VERSION_LESS "3.14")
160164
ctest_submit(PARTS Done)
161165
endif()

0 commit comments

Comments
 (0)