Skip to content

Fix Smith CI #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chapman39 merged 8 commits into from
Dec 5, 2024
Merged

Fix Smith CI #1279

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5938689
Fix smith ci: run build script in smith repo
chapman39 Dec 3, 2024
7d69bc1
fix directory
chapman39 Dec 3, 2024
4daf287
use build root
chapman39 Dec 3, 2024
40c1a1f
Merge branch 'develop' into bugfix/chapman39/smith-ci
chapman39 Dec 3, 2024
114fd55
update get_repo_dir to find smith or serac repo
chapman39 Dec 3, 2024
46b9cf4
Merge branch 'bugfix/chapman39/smith-ci' of github.com:LLNL/serac int…
chapman39 Dec 3, 2024
234d04a
attempt to revert changes to get_repo_dir
chapman39 Dec 4, 2024
586ede5
use project source dir
chapman39 Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions scripts/gitlab/build_and_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ echo "DO_INTEGRATION_TESTS=${DO_INTEGRATION_TESTS}"
echo "EXTRA_BUILD_OPTIONS=${EXTRA_BUILD_OPTIONS}"
echo "EXTRA_CMAKE_OPTIONS=${EXTRA_CMAKE_OPTIONS}"
echo "HOST_CONFIG=${HOST_CONFIG}"
echo "BUILD_ROOT=${BUILD_ROOT}"

# EXTRA_CMAKE_OPTIONS needs quotes wrapped around it, since it may contain spaces, and we want them all to be a part of
# one large string. (e.g. "-DSERAC_ENABLE_CODEVELOP=ON -DENABLE_DOCS=OFF")
Expand All @@ -14,6 +15,7 @@ echo "HOST_CONFIG=${HOST_CONFIG}"
python3 scripts/llnl/build_src.py -v \
--host-config=${HOST_CONFIG} \
--extra-cmake-options="${EXTRA_CMAKE_OPTIONS}" \
--directory=${BUILD_ROOT} \
${EXTRA_BUILD_OPTIONS}
if [ $? -ne 0 ]; then { echo "ERROR: build_src.py failed." ; exit 1; } fi

Expand Down