Merge pull request #347 from VERITAS-Observatory/cpp11-build

Download sofa/vbf outside of container

Author: GernotMaier

.github/workflows/ci-buildmatrix-cpp11.yml

@@ -42,32 +42,34 @@ 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 --retry 3 --retry-delay 3 "https://syncandshare.desy.de/index.php/s/${VBF_TOKEN}/download" -o VBF.tar.gz
+          mkdir -p sofa
+          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: |
           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
               make -j4
               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

.github/workflows/ci-buildmatrix-cpp17.yml

@@ -27,15 +27,15 @@ 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
           make install
 
       - 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