From d85e0d6abfa9c458286ecaf23647c781fc83695b Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 14 Oct 2024 10:12:53 -0400 Subject: [PATCH 1/2] Switch to use singularity 4.1.4 instead of 3.10.4 Since there is no older version build for noble and GitHub upgraded to that newer Ubuntu. --- .github/workflows/build-ubuntu.yaml | 2 +- .github/workflows/template/build-{{ostype}}.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ubuntu.yaml b/.github/workflows/build-ubuntu.yaml index fe23e16323..d41a806467 100644 --- a/.github/workflows/build-ubuntu.yaml +++ b/.github/workflows/build-ubuntu.yaml @@ -58,7 +58,7 @@ jobs: run: | # use if decide to get most recent release of singularity # release="$(gh api --jq .tag_name repos/sylabs/singularity/releases/latest)" - release="v3.10.4" + release="v4.1.4" codename="$(lsb_release -cs)" arch="$(dpkg --print-architecture)" cd /tmp diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index a63897b1f5..a4882704aa 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -60,7 +60,7 @@ jobs: run: | # use if decide to get most recent release of singularity # release="$(gh api --jq .tag_name repos/sylabs/singularity/releases/latest)" - release="v3.10.4" + release="v4.1.4" codename="$(lsb_release -cs)" arch="$(dpkg --print-architecture)" cd /tmp From 39b0c32ef53cbae82e7e89dc9908e6768fe4d4f5 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Mon, 14 Oct 2024 10:20:08 -0400 Subject: [PATCH 2/2] Explicitly request to install libfuse2t64 but in general allow dpkg -i to fail and try to fix with install -f. Verify by running singularity --version --- .github/workflows/build-ubuntu.yaml | 5 ++++- .github/workflows/template/build-{{ostype}}.yaml.j2 | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ubuntu.yaml b/.github/workflows/build-ubuntu.yaml index d41a806467..2ab8185b43 100644 --- a/.github/workflows/build-ubuntu.yaml +++ b/.github/workflows/build-ubuntu.yaml @@ -62,9 +62,12 @@ jobs: codename="$(lsb_release -cs)" arch="$(dpkg --print-architecture)" cd /tmp + sudo apt-get install libfuse2t64 wget -O singularity-ce.deb https://github.com/sylabs/singularity/releases/download/$release/singularity-ce_${release#v}-${codename}_$arch.deb - sudo dpkg -i singularity-ce.deb + sudo dpkg -i singularity-ce.deb || : sudo apt-get install -f + # Verify that singularity functions since might have failed before + singularity --version - name: Determine git-annex ref to build run: | diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index a4882704aa..2326a90bc8 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -64,9 +64,12 @@ jobs: codename="$(lsb_release -cs)" arch="$(dpkg --print-architecture)" cd /tmp + sudo apt-get install libfuse2t64 wget -O singularity-ce.deb https://github.com/sylabs/singularity/releases/download/$release/singularity-ce_${release#v}-${codename}_$arch.deb - sudo dpkg -i singularity-ce.deb + sudo dpkg -i singularity-ce.deb || : sudo apt-get install -f + # Verify that singularity functions since might have failed before + singularity --version {% elif ostype == "macos" %} - name: Set up system