Skip to content

Commit 78ba1dc

Browse files
authored
Update docker CI (#106)
1 parent 4c49c77 commit 78ba1dc

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,17 @@ jobs:
3737
- name: Tests
3838
run: |
3939
/bin/bash -c " \
40-
source ${EXAWIND_MANAGER}/start.sh && \
41-
spack-start && \
42-
mkdir -p ${EXAWIND_MANAGER}/environments/exawind && \
43-
cd ${EXAWIND_MANAGER}/environments/exawind && \
40+
cd ${EXAWIND_MANAGER} && git checkout main && git pull origin main && \
41+
source ${EXAWIND_MANAGER}/start.sh && spack-start && \
42+
quick-create-dev -n my-env -s exawind@master && \
43+
cd ${EXAWIND_MANAGER}/environments/my-env && \
44+
rm -rf exawind && \
4445
ln -s ${GITHUB_WORKSPACE} exawind && \
45-
spack -e e4s-build config add view:true && \
46-
spack -e e4s-build add cmake^zlib-ng~new_strategies && \
46+
spack -e e4s-build add cmake && \
4747
spack -e e4s-build concretize -f && \
48-
quick-create-dev -s exawind@master && \
4948
spack manager external ${EXAWIND_MANAGER}/environments/e4s-build --exclude exawind && \
5049
spack concretize -f && \
5150
spack install && \
5251
spack cd -b exawind && \
53-
spack build-env exawind ctest -j $(nproc) --output-on-failure \
52+
spack build-env exawind ctest -j $(nproc) -LE no-ci --output-on-failure \
5453
"

test/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ function(add_test_r TEST_NAME)
8080
ATTACHED_FILES "${CURRENT_TEST_BINARY_DIR}/${TEST_NAME}.log")
8181
endfunction(add_test_r)
8282

83+
# Regression tests excluded from CI
84+
function(add_test_re TEST_NAME)
85+
add_test_r(${TEST_NAME})
86+
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "regression;no-ci")
87+
endfunction(add_test_re)
88+
8389
# Regression test with dependency
8490
function(add_test_rd TEST_NAME TEST_DEPENDENCY)
8591
add_test_r(${TEST_NAME})
@@ -98,9 +104,9 @@ add_test_r(hybrid-multi-cylinder)
98104
add_test_r(flat-surface)
99105
add_test_r(sloshing-tank)
100106
add_test_r(linear-waves)
101-
add_test_r(stokes-waves-cylinder)
102107
add_test_r(dam-break-block)
103108
add_test_r(abl-bndry-output)
104109
add_test_rd(abl-bndry-input abl-bndry-output)
105110
add_test_r(nalu-nalu-cylinder)
106111
add_test_r(nalu-nalu-cylinder-motion)
112+
add_test_re(stokes-waves-cylinder)

0 commit comments

Comments
 (0)