Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
d3fddb1
JCF: Issue #510: raw, carbon copy of gcc package.py directory as reve…
Dec 9, 2025
395b52c
JCF: Issue #510: add newer versions of gcc and cmake, lines plucked f…
Dec 9, 2025
04baa16
JCF: Issue #510: for starters, bump to new versions of gcc and CMake
Dec 10, 2025
9100110
JCF: Issue #510: try to fix a "-- Could NOT find JsonCpp" error when …
Dec 10, 2025
739741e
JCF: Issue #510: add a patch designed to help cyrus-sasl build with g…
Dec 10, 2025
f3af6cf
JCF: Issue #510: vendor gdb so I can provide newer versions than what…
Dec 10, 2025
aced023
JCF: Issue #510: vendor krb5 so I can manually add a fix from https:/…
Dec 10, 2025
12ce95f
JCF: tag cyrus-sasl on its master branch since it no longer cuts tags…
Dec 13, 2025
7e8ee61
JCF: Issue #510: temporarily disable the llvm build as it's very slow…
Dec 15, 2025
ca2c18c
JCF: Issue #510: add in gcc 14.3, even the November 2025 version of f…
Dec 16, 2025
6b96d7e
JCF: Issue #510: patches and version bumps to accommodate newer CMake
Dec 16, 2025
b15b5d1
JCF: Issue #510: change externals in config/coredaq-release/release.yaml
Dec 16, 2025
303ac1c
JCF: Issue #510: engage in extensive vendoring of various externals s…
Dec 17, 2025
3366f8c
JCF: Issue #510: bump Python up from v3.10.10 to v3.12.12
Dec 29, 2025
1ede4df
JCF: Issue #510: account for the fact that under Python v3.12.12 we g…
Dec 29, 2025
2b5682c
JCF: Issue #510: another round of updates to accommodate newer CMake …
Dec 30, 2025
33146d1
JCF: Issue #510: force felix-software to continue to be built with th…
Dec 30, 2025
ae6745c
JCF: Issue #510: switch from Python 3.12.12 to Python 3.11.14
Dec 30, 2025
b9e8ee0
JCF: Issue #510: assume externals v2.3 when creating the externals image
Dec 30, 2025
54f929a
JCF: Issue #510: upgrade the externals the nightly release is based o…
Dec 30, 2025
cd4c722
JCF: Issue #510: remove the last vestiges of reference to the not-use…
Dec 30, 2025
5fd56b9
JCF: Issue #510: correct for the fact the the suffix for the v2.3 ext…
Dec 30, 2025
6273d10
JCF: Issue #510: make sure to set the externals to v2.3 for the night…
Dec 30, 2025
e125fb9
JCF: Issue #510: also, of course, for externals v2.3 we currently use…
Dec 30, 2025
c2aec43
JCF: Issue #510: adjust the externals so they support Python 3.12.12
Jan 1, 2026
0c7332a
JCF: Issue #510: modify the nightly build to use the latest test v2.3…
Jan 2, 2026
b5f9649
JCF: Issue #510: fix issue possibly related to fetch depth when the t…
Jan 2, 2026
e30d2da
JCF: Issue #510: more modification to the daq-release checkout to try…
Jan 2, 2026
2190e4b
Revert "JCF: Issue #510: more modification to the daq-release checkou…
Jan 2, 2026
8bdb0d2
Revert "JCF: Issue #510: fix issue possibly related to fetch depth wh…
Jan 2, 2026
bf86662
JCF: Issue #510: bump Python package kafka-python version, otherwise …
Jan 3, 2026
7bca1b3
JCF: Issue #510: vendor llvm since 18.1.3, the highest available as a…
Jan 3, 2026
3410d34
JCF: Issue #510: make sure to build CMake using system openssl rather…
Jan 5, 2026
425912b
JCF: Issue #510: log the results of the (attempted) package uninstall…
Jan 5, 2026
b27eb75
JCF: Issue #510: remove requested conflict between gcc 14.x and cyrus…
Jan 6, 2026
ea18fd5
JCF: Issue #510: bump to the latest test externals image for external…
Jan 6, 2026
ca8e751
JCF: Issue #510: I vendored go and go-bootstrap in what was ultimatel…
Jan 7, 2026
bacc37a
JCF: Issue #510: thanks to shared object library problems described i…
Jan 7, 2026
bccc2ed
JCF: Issue #510: bump to the latest test externals image for external…
Jan 7, 2026
9e39bb6
JCF: Issue #510: make sure the build system knows to use the original…
Jan 7, 2026
60742c7
JCF: Issue #510: first pass at updating the pyproject.toml "constrain…
Jan 8, 2026
2cdd90e
JCF: Issue #510: add all packages listed in individual pure python re…
Jan 8, 2026
abf9daa
JCF: Issue #510: update the Python packages
Jan 9, 2026
2ae6037
JCF: Issue #510: yaml.safe_load appears to be interpreting the 0.10 f…
Jan 9, 2026
1f39cdf
JCF: Issue #510: add support for rclone v1.69.1
Jan 13, 2026
75896d8
JCF: Issue #510: add support for openmpi v5.0.9
Jan 13, 2026
391a53e
JCF: Issue #510: bump versions of rclone and openmpi which we use
Jan 13, 2026
696e2a4
JCF: Issue #510: bump to the latest externals image, which includes u…
Jan 13, 2026
72e9e96
JCF: Issue #510: add a patch to make the CMP0116 warning (only need t…
Jan 14, 2026
505ce71
JCF: Issue #510: add a patch to CMake to suppress a very tedious warn…
Jan 14, 2026
31b6814
JCF: Issue #510: bump the nightly to the latest externals image on th…
Jan 15, 2026
168fb67
JCF: Issue #510: try adding gcc-runtime as a direct dependency of dev…
Jan 15, 2026
2fb9aa3
JCF: Issue #510: previous commit turned out to be a no-op, basically
Jan 16, 2026
ecbd8c2
Merge branch 'develop' into johnfreeman/issue510_externals_v2.3
Feb 3, 2026
3070807
JCF: Issue #510: standardize the workflows to use ghcr.io/dune-daq/al…
Feb 3, 2026
61156ec
Merge remote-tracking branch 'origin/develop' into johnfreeman/issue5…
Feb 5, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build-candidate-release-alma9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: build_dev_release_spack
runs-on: daq
container:
image: ghcr.io/dune-daq/alma9-slim-externals:v2.2
image: ghcr.io/dune-daq/alma9-slim-externals:v2.3
defaults:
run:
shell: bash
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
strategy:
matrix:
include:
- input_image: "ghcr.io/dune-daq/alma9-slim-externals:v2.2"
- input_image: "ghcr.io/dune-daq/alma9-slim-externals:v2.3"
output_image: "ghcr.io/dune-daq/candidate-release-alma9"
tag: ${{ github.event.inputs.det }}daq-${{ github.event.inputs.det-release }}-rc${{ github.event.inputs.build-number }}-a9
needs: build_the_candidate_release_spack
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-nightly-release-alma9.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Alma9 build v5 nightly release with externals v2.2
name: Alma9 build v5 nightly release with externals v2.3

on:
schedule:
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
runs-on: daq
needs: make_tags
container:
image: ghcr.io/dune-daq/alma9-slim-externals:v2.2
image: ghcr.io/dune-daq/alma9-slim-externals:v2.3
defaults:
run:
shell: bash
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
strategy:
matrix:
include:
- input_image: "ghcr.io/dune-daq/alma9-slim-externals:v2.2"
- input_image: "ghcr.io/dune-daq/alma9-slim-externals:v2.3"
output_image: "ghcr.io/dune-daq/nightly-release-alma9"
tag: "development_v5${{ github.event.inputs.tag-prefix }}"
needs: [build_the_develop_release_spack, make_tags]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-stable-release-alma9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
name: build_stable_release_spack
runs-on: daq
container:
image: ghcr.io/dune-daq/alma9-slim-externals:v2.2
image: ghcr.io/dune-daq/alma9-slim-externals:v2.3
defaults:
run:
shell: bash
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
strategy:
matrix:
include:
- input_image: "ghcr.io/dune-daq/alma9-slim-externals:v2.2"
- input_image: "ghcr.io/dune-daq/alma9-slim-externals:v2.3"
output_image: "ghcr.io/dune-daq/stable-release-alma9"
tag: ${{ github.event.inputs.det }}daq-${{ github.event.inputs.det-release }}-a9
needs: build_the_stable_release_spack
Expand Down
26 changes: 12 additions & 14 deletions .github/workflows/slim_externals.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on:
workflow_dispatch:
inputs:
tag-suffix:
description: 'optional suffix for test-only externals image (e.g., T would mean alma9-slim-externals:v2.2T)'
description: 'optional suffix for test-only externals image (e.g., T would mean alma9-slim-externals:v2.3T)'
default: ''
account-to-copy:
description: 'the user account whose docker-scratch/cvmfs_dunedaq area you want to copy (default dunedaq)'
default: 'dunedaq'
spack-version:
description: 'the version of Spack the v2.2 externals were built with (default 0.22.0)'
description: 'the version of Spack the v2.3 externals were built with (default 0.22.0)'
default: '0.22.0'

jobs:
Expand All @@ -24,8 +24,8 @@ jobs:
steps:
- name: Intro
run: |
echo "Will create a ghcr.io/dune-daq/alma9-slim-externals:v2.2${{ github.event.inputs.tag-suffix }} image"
echo "Image contents will include $HOSTNAME:/home/nfs/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq/spack/externals/ext-v2.2/spack-${{ github.event.inputs.spack-version }}"
echo "Will create a ghcr.io/dune-daq/alma9-slim-externals:v2.3${{ github.event.inputs.tag-suffix }} image"
echo "Image contents will include $HOSTNAME:/home/nfs/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq/spack/externals/ext-v2.3/spack-${{ github.event.inputs.spack-version }}"

- name: Log in to the Container registry
uses: docker/login-action@v3
Expand All @@ -41,7 +41,7 @@ jobs:
images: |
ghcr.io/dune-daq/alma9-slim-externals
tags: |
type=raw,value=v2.2${{ github.event.inputs.tag-suffix }}-initial
type=raw,value=v2.3${{ github.event.inputs.tag-suffix }}-initial

- name: prepare build dir
id: prep_build_dir
Expand All @@ -52,12 +52,11 @@ jobs:
echo "FROM ghcr.io/dune-daq/alma9-spack:latest" > Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "ADD spack/externals/ext-v2.2/spack-${{ github.event.inputs.spack-version }} /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v2.2/spack-${{ github.event.inputs.spack-version }}" >> Dockerfile
echo "RUN source /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v2.2/spack-${{ github.event.inputs.spack-version }}/share/spack/setup-env.sh && spack uninstall -y llvm || true" >> Dockerfile
echo "ADD spack/externals/ext-v2.3/spack-${{ github.event.inputs.spack-version }} /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v2.3/spack-${{ github.event.inputs.spack-version }}" >> Dockerfile
echo "RUN source /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v2.3/spack-${{ github.event.inputs.spack-version }}/share/spack/setup-env.sh && spack uninstall -y llvm || true" >> Dockerfile
echo "ADD tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "ADD assets /cvmfs/dunedaq.opensciencegrid.org/assets" >> Dockerfile
echo "ADD setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "ADD pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo 'ENTRYPOINT ["/bin/bash"]' >> Dockerfile

- name: Build and push Docker images
Expand Down Expand Up @@ -100,7 +99,7 @@ jobs:
images: |
ghcr.io/dune-daq/alma9-slim-externals
tags: |
type=raw,value=v2.2${{ github.event.inputs.tag-suffix }}
type=raw,value=v2.3${{ github.event.inputs.tag-suffix }}

- name: prepare build dir
run: |
Expand All @@ -111,11 +110,10 @@ jobs:
echo "FROM ghcr.io/dune-daq/alma9-spack:latest" > Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.2${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.2${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.2${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/assets /cvmfs/dunedaq.opensciencegrid.org/assets" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.2${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.2${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.3${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.3${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.3${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/assets /cvmfs/dunedaq.opensciencegrid.org/assets" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.3${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo 'ENTRYPOINT ["/bin/bash"]' >> Dockerfile

- name: Build and push Docker images
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/wf-setup-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ echo "Assuming detector release tag is $DET_RELEASE_TAG (i.e. the same name as t
if [[ $OS == almalinux9 && $RELEASE_TYPE == production_v4 ]]; then # Alma9 v4 production nightly, externals v2.0
export EXT_VERSION=v2.0
export GCC_VERSION=12.1.0
elif [[ $OS == almalinux9 && $RELEASE_TYPE == nightly ]]; then # Alma9 v5 development nightly, externals v2.2
export EXT_VERSION=v2.2
export GCC_VERSION=13.2.0
elif [[ $OS == almalinux9 && $RELEASE_TYPE == nightly ]]; then # Alma9 v5 development nightly, externals v2.3
export EXT_VERSION=v2.3
export GCC_VERSION=14.3.0
elif [[ $OS == almalinux9 && $DET_RELEASE_TAG =~ "v4." ]]; then # Alma9 v4 candidate or stable, externals v2.0
export EXT_VERSION=v2.0
export GCC_VERSION=12.1.0
Expand Down
28 changes: 17 additions & 11 deletions configs/coredaq/coredaq-develop/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
version: 3.17.14
variant: ~
- name: nlohmann-json
version: 3.11.2
version: 3.12.0
variant: ~
- name: pistache
version: fddaq-v5.3.0
version: fddaq-v5.6.0
variant: ~
- name: highfive
version: 2.9.0
Expand All @@ -41,7 +41,7 @@
version: 2.12.0
variant: ~
- name: uhal
version: 2.8.1
version: 2.8.18
variant: ~
- name: librdkafka
version: 2.2.0
Expand All @@ -56,7 +56,7 @@
version: fddaq-v5.3.0
variant: ~
- name: folly
version: 2024.12.02.00
version: 2025.11.24.00
variant: "cxxstd=2a"
- name: cli11
version: 2.3.2
Expand All @@ -74,13 +74,13 @@
version: 0.6.7
variant: ~
- name: py-anyconfig
version: 0.9.11
version: 0.14.0
variant: ~
- name: py-jsonnet
version: 0.16.0
variant: ~
- name: rclone
version: 1.64.0
version: 1.69.1
variant: ~
- name: libtorrent
version: 2.0.9
Expand All @@ -91,24 +91,30 @@
- name: libevent
version: 2.1.12
variant: "~openssl"
- name: glib
version: 2.80.5
variant: ~
- name: openmpi
version: 5.0.9
variant: ~

devtools:
- name: cmake
version: 3.26.3
variant: "~ownlibs"
version: 4.1.2
variant: "+ownlibs"
- name: gdb
version: 14.1
version: 16.2
variant: "~python"
- name: ninja
version: 1.10.0
variant: ~

systems:
- name: python
version: 3.10.10
version: 3.12.12
variant: "~ssl"
- name: gcc
version: 13.2.0
version: 14.3.0
variant: "+binutils"

coredaq:
Expand Down
Loading