From c0f91104076f06ae3f79c78115af0ce80084d105 Mon Sep 17 00:00:00 2001 From: Stephen Fegan Date: Mon, 16 Sep 2024 07:30:22 +0200 Subject: [PATCH] Update singularity build to use ADH APIs --- .github/workflows/native-build-and-test.yml | 2 +- .github/workflows/singularity-build-and-deploy.yml | 2 +- singularity_build.def | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/native-build-and-test.yml b/.github/workflows/native-build-and-test.yml index 71b9041f..a6b0bbba 100644 --- a/.github/workflows/native-build-and-test.yml +++ b/.github/workflows/native-build-and-test.yml @@ -70,7 +70,7 @@ jobs: libpcap-dev libz-dev libprotobuf-c-dev protobuf-c-compiler \ libprotobuf-dev protobuf-compiler libprotoc-dev libzstd-dev \ ${{ matrix.compiler[2] }} - curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | sudo tar -zxvf - -C / + curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | sudo tar -zxf - -C / curl -L https://github.com/llr-cta/Geant4Build/releases/download/${{matrix.os}}-${{matrix.geant}}-OFF/Geant4-${{matrix.os}}-${{matrix.geant}}-OFF.tbz2 | sudo tar -jxf - -C / - name: Print version information shell: bash diff --git a/.github/workflows/singularity-build-and-deploy.yml b/.github/workflows/singularity-build-and-deploy.yml index ddf68421..7cd5f7d2 100644 --- a/.github/workflows/singularity-build-and-deploy.yml +++ b/.github/workflows/singularity-build-and-deploy.yml @@ -52,7 +52,7 @@ jobs: libprotobuf-dev protobuf-compiler libprotoc-dev libzstd-dev \ build-essential libssl-dev uuid-dev libgpgme11-dev squashfs-tools \ libseccomp-dev pkg-config - curl -L https://github.com/llr-cta/CamerasToACTLRelease/releases/download/${{matrix.os}}/CamerasToACTL-${{matrix.os}}.tgz | sudo tar -zxf - -C / + curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | sudo tar -zxf - -C / curl -L https://github.com/llr-cta/Geant4Build/releases/download/${{matrix.os}}-${{matrix.geant}}-OFF/Geant4-${{matrix.os}}-${{matrix.geant}}-OFF.tbz2 | sudo tar -jxf - -C / - name: Configure calin diff --git a/singularity_build.def b/singularity_build.def index be125624..fd741586 100644 --- a/singularity_build.def +++ b/singularity_build.def @@ -106,7 +106,7 @@ From: ubuntu:22.04 export CAMERASTOACTL_REL=ubuntu-22.04 export GEANT4_REL=ubuntu-22.04-11.2.2-OFF - curl -L https://github.com/llr-cta/CamerasToACTLRelease/releases/download/$CAMERASTOACTL_REL/CamerasToACTL-$CAMERASTOACTL_REL.tgz | tar -zxf - -C / + curl -L https://github.com/llr-cta/CTA_ADH_APIS_Build/releases/download/${{matrix.os}}/cta_adh_apis_installed.tgz | tar -zxf - -C / curl -L https://github.com/llr-cta/Geant4Build/releases/download/$GEANT4_REL/Geant4-$GEANT4_REL.tbz2 | tar -jxf - -C / tar -zxf /tmp/calin_installed.tgz -C /