Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
31ae892
fix a typo that I previously made in the dockerfile
mabruzzo Sep 14, 2025
205cb55
Merge branch 'dev' into fix-the-Dockerfile
evaneschneider Sep 15, 2025
ca8a6d6
Merge branch 'dev' into fix-the-Dockerfile
evaneschneider Sep 22, 2025
2a22f81
add some shell commands to diagnose Jenkins problems
mabruzzo Sep 29, 2025
86ee179
Merge branch 'dev' into fix-the-Dockerfile
mabruzzo Sep 29, 2025
dcda337
an attempt to more robustly setup submodules
mabruzzo Oct 8, 2025
5be0d16
fix a minor oversight
mabruzzo Oct 8, 2025
56d16d7
rewrite download-check and light tweaks
mabruzzo Oct 14, 2025
3307b40
a quick test
mabruzzo Oct 19, 2025
9740a55
Introduce a recovery strategy when git-lfs fails
mabruzzo Oct 20, 2025
b74183b
introduce a debug print step
mabruzzo Oct 20, 2025
ce7899f
completely disable git-lfs
mabruzzo Oct 20, 2025
90c03fb
a crazy check
mabruzzo Oct 20, 2025
fc42d80
another debug-step
mabruzzo Oct 20, 2025
8367153
more investigation
mabruzzo Oct 20, 2025
62919b8
another attempt
mabruzzo Oct 20, 2025
9b10dcb
reproduce all the errors
mabruzzo Oct 20, 2025
10b0931
another tweak
mabruzzo Oct 20, 2025
8c57393
use git submodule update --init
mabruzzo Oct 20, 2025
8b43a95
another tweak
mabruzzo Oct 20, 2025
2cf4b52
go back to scripting
mabruzzo Oct 20, 2025
af61926
lets try it
mabruzzo Oct 20, 2025
882a386
show git settings
mabruzzo Oct 20, 2025
019f2cd
try to show detail config
mabruzzo Oct 21, 2025
19f4fa9
try to use git status
mabruzzo Oct 21, 2025
bfc919c
fix git-restore
mabruzzo Oct 21, 2025
4d82df4
another tweak
mabruzzo Oct 21, 2025
5fd6f5b
updating Jenkinsfile
mabruzzo Oct 21, 2025
91f42b3
try printing contents of Jenkinsfiles
mabruzzo Oct 21, 2025
4eeab7b
another tweak
mabruzzo Oct 21, 2025
52add8c
another tweak
mabruzzo Oct 21, 2025
56027de
hopefully this will work!
mabruzzo Oct 21, 2025
f57da15
re-enable other tests
mabruzzo Oct 21, 2025
4ad9675
Merge branch 'dev' into fix-the-Dockerfile
mabruzzo Oct 22, 2025
3583b5b
final cleanup of ci-setup-submodule.py
mabruzzo Oct 22, 2025
d06341b
fix a minor oversight
mabruzzo Oct 22, 2025
48589a2
address an oversight
mabruzzo Oct 22, 2025
717ce8d
Merge branch 'dev' into fix-the-Dockerfile
mabruzzo Oct 22, 2025
4d52f3c
Merge branch 'dev' into fix-the-Dockerfile
evaneschneider Oct 27, 2025
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
15 changes: 14 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,20 @@ pipeline
steps
{
sh '''
git submodule update --init --recursive
if [ "${CHOLLA_MAKE_TYPE}" = "cosmology" ] ||
[ "${CHOLLA_MAKE_TYPE}" = "mhd" ] ||
[ "${CHOLLA_MAKE_TYPE}" = "hydro" ] ||
[ "${CHOLLA_MAKE_TYPE}" = "gravity" ]; then
./tools/ci-setup-submodule.py \
--color \
--fallback-manual-lfs-download
else
# we skip the download because it's not currently
# necessary & we want to minimize calls to
# downloads from GitHub's raw-urls (when git-lfs
# commonly fails)
echo "hard-coded to skip submodule download"
fi
make clobber
'''
}
Expand Down
4 changes: 2 additions & 2 deletions docker/rocm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN apt-get -y install rocrand

# Needed by Cholla Makefile
ENV CHOLLA_MACHINE=github
ENV HIPCONFIG=/opt/rocm-5.2.3
ENV ROCM_PATH=/opt/rocm-5.2.3
ENV HIPCONFIG=/opt/rocm-5.5.1
ENV ROCM_PATH=/opt/rocm-5.5.1
ENV HDF5_ROOT=/usr/lib/x86_64-linux-gnu/hdf5/serial
ENV MPI_ROOT=/usr/lib/x86_64-linux-gnu/openmpi
12 changes: 10 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,27 @@ testpaths = [
"python/tests",
]

[tool.ruff.per-file-target-version]
# By default, ruff uses project.requires-python to infer the project-wide
# python version (certain linting/formatting options may be enabled or disabled
# based on this choice). Here, we are overwriting this version for our developer/CI
# scripts which may depend on the system-python
"tools/**" = "py37"


[tool.ruff.lint]
exclude = [
"python_scripts/**",
"docs/sphinx/conf.py",
"docs/sphinx/PythonExamples/**",
"tools/**"
"tools/analyze_tidy_checks.py"
]

[tool.ruff.format]
exclude = [
"python_scripts/**",
"docs/sphinx/conf.py",
"docs/sphinx/PythonExamples/**",
"tools/**"
"tools/analyze_tidy_checks.py"
]

Loading