Skip to content

Commit f2c5744

Browse files
fix: Use root-binaries conda-forge package as build base (#5)
* Base build around conda-forge 'root-binaries' to get ROOT runtime * Add checks to build CI for ROOT, hist2workspace, and common utilities
1 parent d7e3ad6 commit f2c5744

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ jobs:
2222
--tag pyhf/pyhf-validation-root-base:$GITHUB_SHA \
2323
--compress
2424
docker images
25+
- name: Check PATH
26+
run: |
27+
docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which python;python --version;which root;root-config --version;hist2workspace --help"
28+
docker run --rm pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "which curl;which tar"
2529
- name: Run tests
2630
run: |
2731
docker run --rm -v $PWD:$PWD -w $PWD pyhf/pyhf-validation-root-base:$GITHUB_SHA -c "python tests/rf308_normintegration2d.py"

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,19 @@ RUN conda config --add channels conda-forge && \
1212
conda config --set allow_softlinks false && \
1313
conda config --set always_copy true
1414
RUN conda create --yes --quiet -p /opt/condaenv \
15-
"root_base=$ROOT_VERSION" \
15+
"root-binaries=$ROOT_VERSION" \
1616
"python=$PYTHON_VERSION"
1717
# Forcibly remove some packages to make the final image smaller
1818
# c.f. https://github.com/conda-forge/root-feedstock/blob/master/recipe/meta.yaml
1919
RUN eval "$(python -m conda shell.bash hook)" && \
2020
conda activate /opt/condaenv && \
21-
conda install -y \
22-
libblas \
23-
libcblas \
24-
fftw \
25-
zlib
21+
conda remove --yes --force-remove \
22+
pythia8 \
23+
qt \
24+
libllvm9 \
25+
libclang \
26+
pandoc \
27+
xrootd
2628
RUN rm -rf /opt/condaenv/tutorials /opt/condaenv/ui5
2729

2830
FROM base

0 commit comments

Comments
 (0)