search

SyneRBI / SIRF-SuperBuild

SIRF CMake SuperBuild
http://www.ccpsynerbi.ac.uk
Apache License 2.0
15 stars 17 forks source link

docker: edge images have old CIL #911

Closed casperdcl closed 4 days ago

casperdcl commented 4 days ago

CIL v24.0.0 from 2 months ago via conda - rather than CIL master via CMake/pip - is installed in ghcr.io/synerbi/sirf:edge images.

Unfortunately the careful handling of BUILD_CIL in #897 seems not to have been enough.

casperdcl commented 4 days ago

upon inspection, it seems this line seems to conda install cil=24.0.0 in the edge images: https://github.com/SyneRBI/SIRF-SuperBuild/blob/0bec4e74a97c558b6a5756c0ca641a75d5ab2c6c/Dockerfile#L28-L37

Note that edge images use SuperBuild@master but NOT DEVEL_BUILD NOR BUILD_CIL.

Should we do BUILD_CIL=ON for edge images? I suppose we shouldn't do DEVEL_BUILD=ON.

Current:

git ref BUILD_CIL DEVEL_BUILD docker tag
master OFF OFF edge
tag OFF OFF latest,M.m.p

Proposed:

git ref BUILD_CIL DEVEL_BUILD docker tag
master ON ? edge
tag OFF OFF latest,M.m.p

effectively so we trigger:

https://github.com/SyneRBI/SIRF-SuperBuild/blob/0bec4e74a97c558b6a5756c0ca641a75d5ab2c6c/version_config.cmake#L164