Skip to content

Commit 493ff61

Browse files
committed
Remove barely useful manage_externals check and update test as necessary
The check is commented out and noted so that in the future a potentially better check may be created instead
1 parent 2092103 commit 493ff61

2 files changed

Lines changed: 19 additions & 5 deletions

File tree

.github/workflows/test_workflow.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,17 @@ jobs:
100100
submodules: true
101101
ref: ${{ inputs.event_name == 'push' && github.ref || inputs.ref }}
102102

103+
############################################################################
104+
# WRF Specific
105+
# More checkout, just do everything so we have it all at the ready. This unfortunately will limit testing
106+
# of on-the-fly checkouts
107+
- name: Checkout extra via manage_externals
108+
id : manage_externals
109+
run : |
110+
cd main
111+
./tools/manage_externals/checkout_externals -e arch/Externals.cfg
112+
############################################################################
113+
103114

104115
# Immediately copy out to # of tests to do
105116
- name: Create testing directories

CMakeLists.txt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,14 @@ execute_process(
344344
OUTPUT_FILE ${LOG_FILE}
345345
ERROR_FILE ${LOG_FILE}
346346
)
347-
if ( ${MANAGE_EXTERNALS_STATUS} AND NOT ${MANAGE_EXTERNALS_STATUS} EQUAL 0 )
348-
message( FATAL_ERROR "Failed to checkout external repos via manage_externals" )
349-
else()
350-
message( STATUS "Finished checking out external repos via manage_externals" )
351-
endif()
347+
# The manage_externals return code only informs critical failures and not whether the code
348+
# exists or not and so this check often leads to false positives (success) when failure
349+
# was expected
350+
# if ( ${MANAGE_EXTERNALS_STATUS} AND NOT ${MANAGE_EXTERNALS_STATUS} EQUAL 0 )
351+
# message( FATAL_ERROR "Failed to checkout external repos via manage_externals" )
352+
# else()
353+
# message( STATUS "Finished checking out external repos via manage_externals" )
354+
# endif()
352355

353356

354357
################################################################################

0 commit comments

Comments
 (0)