From 3246925d6d8bb27c3a6fb692b2d21489166bdf98 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Sat, 28 Mar 2026 15:01:17 +0100 Subject: [PATCH 1/2] download sofa/vbf outside of container --- .github/workflows/ci-buildmatrix-cpp11.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp11.yml b/.github/workflows/ci-buildmatrix-cpp11.yml index f6a2398e..de1379e6 100644 --- a/.github/workflows/ci-buildmatrix-cpp11.yml +++ b/.github/workflows/ci-buildmatrix-cpp11.yml @@ -42,23 +42,27 @@ jobs: - name: Extract source run: tar -xzf src.tgz - - name: Build inside ROOT CentOS7 container + - name: Download VBF and SOFA on host env: VBF_TOKEN: ${{ secrets.VBFcpp11 }} SOFA20231011: ${{ secrets.SOFA20231011 }} + run: | + set -euo pipefail + curl -fL "https://syncandshare.desy.de/index.php/s/${VBF_TOKEN}/download" -o VBF.tar.gz + mkdir -p sofa + curl -fL "https://syncandshare.desy.de/index.php/s/${SOFA20231011}/download" -o sofa/sofa.tar.gz + + - name: Build inside ROOT CentOS7 container run: | set -euo pipefail echo "Using ROOT image: $ROOT_IMAGE" docker run --rm \ - -e VBF_TOKEN="$VBF_TOKEN" \ - -e SOFA20231011="$SOFA20231011" \ -v "$PWD:/workspace" \ -w /workspace \ "$ROOT_IMAGE" /bin/bash -c ' set -euo pipefail echo "ROOT version: $(root-config --version)" # Build VBF - curl -L "https://syncandshare.desy.de/index.php/s/${VBF_TOKEN}/download" -o VBF.tar.gz mkdir -p VBF && tar -xzf VBF.tar.gz -C VBF --strip-components=1 pushd VBF ./configure --prefix=/workspace/VBF @@ -66,8 +70,6 @@ jobs: make install popd # Install SOFA - mkdir -p sofa - curl -L "https://syncandshare.desy.de/index.php/s/${SOFA20231011}/download" -o sofa/sofa.tar.gz ./install_sofa.sh # Build EventDisplay export EVNDISPSYS=/workspace From 07d068f6e1a0000a9b2bb4b4a0fd44ba60ad5936 Mon Sep 17 00:00:00 2001 From: Gernot Maier Date: Sat, 28 Mar 2026 15:13:40 +0100 Subject: [PATCH 2/2] retry 3 --- .github/workflows/ci-buildmatrix-cpp11.yml | 4 ++-- .github/workflows/ci-buildmatrix-cpp17.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-buildmatrix-cpp11.yml b/.github/workflows/ci-buildmatrix-cpp11.yml index de1379e6..95b325ea 100644 --- a/.github/workflows/ci-buildmatrix-cpp11.yml +++ b/.github/workflows/ci-buildmatrix-cpp11.yml @@ -48,9 +48,9 @@ jobs: SOFA20231011: ${{ secrets.SOFA20231011 }} run: | set -euo pipefail - curl -fL "https://syncandshare.desy.de/index.php/s/${VBF_TOKEN}/download" -o VBF.tar.gz + curl -fL --retry 3 --retry-delay 3 "https://syncandshare.desy.de/index.php/s/${VBF_TOKEN}/download" -o VBF.tar.gz mkdir -p sofa - curl -fL "https://syncandshare.desy.de/index.php/s/${SOFA20231011}/download" -o sofa/sofa.tar.gz + curl -fL --retry 3 --retry-delay 3 "https://syncandshare.desy.de/index.php/s/${SOFA20231011}/download" -o sofa/sofa.tar.gz - name: Build inside ROOT CentOS7 container run: | diff --git a/.github/workflows/ci-buildmatrix-cpp17.yml b/.github/workflows/ci-buildmatrix-cpp17.yml index 736a9185..12233c65 100644 --- a/.github/workflows/ci-buildmatrix-cpp17.yml +++ b/.github/workflows/ci-buildmatrix-cpp17.yml @@ -27,7 +27,7 @@ jobs: - name: vbf run: | - curl -L https://syncandshare.desy.de/index.php/s/${{ secrets.VBFcpp17 }}/download -o VBF.tar.gz + curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.VBFcpp17 }}/download -o VBF.tar.gz mkdir VBF && tar -xzf VBF.tar.gz -C VBF --strip-components=1 cd VBF && ./configure --prefix=$(echo $GITHUB_WORKSPACE)/VBF make @@ -35,7 +35,7 @@ jobs: - name: sofa run: | - curl -L https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download -o sofa/sofa.tar.gz + curl -L --retry 3 --retry-delay 3 https://syncandshare.desy.de/index.php/s/${{ secrets.SOFA20231011 }}/download -o sofa/sofa.tar.gz ./install_sofa.sh - name: eventdisplay