From 738913224541a64c48534af78528d0a2f7399250 Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:14:27 +0200 Subject: [PATCH 1/5] Add ARM builds Fixes #54 --- .github/workflows/container_build.yml | 5 +++-- .github/workflows/container_build_push.yml | 6 +++--- version/version.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml index db56b62..cd855a9 100644 --- a/.github/workflows/container_build.yml +++ b/.github/workflows/container_build.yml @@ -31,7 +31,6 @@ jobs: type=pep440,pattern={{version}} type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Set up QEMU @@ -73,4 +72,6 @@ jobs: tags: ${{ steps.meta.outputs.tags }} file: ./dockerfiles/container_template/Dockerfile - platforms: linux/amd64 + platforms: + linux/amd64 + linux/arm64 diff --git a/.github/workflows/container_build_push.yml b/.github/workflows/container_build_push.yml index 08d41d1..519acd9 100644 --- a/.github/workflows/container_build_push.yml +++ b/.github/workflows/container_build_push.yml @@ -28,7 +28,6 @@ jobs: type=pep440,pattern={{version}} type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Set up QEMU @@ -70,7 +69,9 @@ jobs: labels: ${{ steps.meta.outputs.labels }} file: ./dockerfiles/container_template/Dockerfile - platforms: linux/amd64 + platforms: + linux/amd64 + linux/arm64 build-apptainer-container: needs: docker @@ -99,7 +100,6 @@ jobs: type=pep440,pattern={{version}} type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Build and push Apptainer container diff --git a/version/version.py b/version/version.py index b49f44b..b022333 100644 --- a/version/version.py +++ b/version/version.py @@ -2,7 +2,7 @@ _MINOR = "1" # On main and in a nightly release the patch should be one ahead of the last # released build. -_PATCH = "0" +_PATCH = "1" # This is mainly for nightly builds which have the suffix ".dev$DATE". See # https://semver.org/#is-v123-a-semantic-version for the semantics. _SUFFIX = "" From 981e989d72f374e2d861b9924a8ee52717fced73 Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:22:36 +0200 Subject: [PATCH 2/5] format --- .github/workflows/container_build.yml | 4 +--- .github/workflows/container_build_push.yml | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml index cd855a9..d8715bb 100644 --- a/.github/workflows/container_build.yml +++ b/.github/workflows/container_build.yml @@ -72,6 +72,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} file: ./dockerfiles/container_template/Dockerfile - platforms: - linux/amd64 - linux/arm64 + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/container_build_push.yml b/.github/workflows/container_build_push.yml index 519acd9..2a8bc15 100644 --- a/.github/workflows/container_build_push.yml +++ b/.github/workflows/container_build_push.yml @@ -69,9 +69,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} file: ./dockerfiles/container_template/Dockerfile - platforms: - linux/amd64 - linux/arm64 + platforms: linux/amd64,linux/arm64 build-apptainer-container: needs: docker From 0bfc87c6dba02f106cf10550d5c5a66468d50c6f Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:32:38 +0200 Subject: [PATCH 3/5] test --- .github/workflows/container_build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml index d8715bb..90cb1e9 100644 --- a/.github/workflows/container_build.yml +++ b/.github/workflows/container_build.yml @@ -53,6 +53,7 @@ jobs: tags: ${{ env.LATEST_TAG }} file: ./dockerfiles/container_template/Dockerfile + platforms: linux/amd64, linux/arm64 - name: Run unit tests I run: | @@ -72,4 +73,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} file: ./dockerfiles/container_template/Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64, linux/arm64 From 8794b4909834e55a5bc51e338afe29d8dbd0294e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 21 Apr 2026 09:09:19 +0000 Subject: [PATCH 4/5] Fix workflow issues from PR review feedback Agent-Logs-Url: https://github.com/precimed/container_template/sessions/898f5abe-bbc3-42e3-80c7-e31c5dff43ef Co-authored-by: espenhgn <2492641+espenhgn@users.noreply.github.com> --- .github/workflows/container_build.yml | 6 +++--- .github/workflows/container_build_push.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml index 7af573d..09570ea 100644 --- a/.github/workflows/container_build.yml +++ b/.github/workflows/container_build.yml @@ -30,6 +30,7 @@ jobs: type=ref,event=pr type=pep440,pattern={{version}} type=semver,pattern={{version}} + type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} type=sha type=raw,value=latest,enable={{is_default_branch}} @@ -53,7 +54,7 @@ jobs: tags: ${{ env.LATEST_TAG }} file: ./dockerfiles/container_template/Dockerfile - platforms: linux/amd64, linux/arm64 + platforms: linux/amd64 - name: Run unit tests I run: | @@ -81,8 +82,7 @@ jobs: with: context: "{{defaultContext}}:docker" push: False - load: True tags: ${{ steps.meta.outputs.tags }} file: ./dockerfiles/container_template/Dockerfile - platforms: linux/amd64, linux/arm64 + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/container_build_push.yml b/.github/workflows/container_build_push.yml index b28319b..e74af7e 100644 --- a/.github/workflows/container_build_push.yml +++ b/.github/workflows/container_build_push.yml @@ -27,6 +27,7 @@ jobs: type=ref,event=pr type=pep440,pattern={{version}} type=semver,pattern={{version}} + type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} type=sha type=raw,value=latest,enable={{is_default_branch}} @@ -113,6 +114,7 @@ jobs: type=ref,event=pr type=pep440,pattern={{version}} type=semver,pattern={{version}} + type=semver,pattern={{major}} type=semver,pattern={{major}}.{{minor}} type=sha type=raw,value=latest,enable={{is_default_branch}} From 68dbddde090681d81f8a00e5bcaaee67fc8dca5d Mon Sep 17 00:00:00 2001 From: Espen Hagen <2492641+espenhgn@users.noreply.github.com> Date: Tue, 21 Apr 2026 11:09:33 +0200 Subject: [PATCH 5/5] update software version info --- scripts/PROJECT_README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/PROJECT_README.md b/scripts/PROJECT_README.md index 7e86737..0a8060b 100644 --- a/scripts/PROJECT_README.md +++ b/scripts/PROJECT_README.md @@ -129,8 +129,8 @@ tar --exclude=".git/*" -cvf container_template_$SHA.tar container_template | OS/tool | Version | License | Source | ------------------- | --------------------- | ----------------- | ------------- | ubuntu | 24.04 | [Creative Commons CC-BY-SA version 3.0 UK licence](https://ubuntu.com/legal/intellectual-property-policy) | [Ubuntu.com](https://ubuntu.com) -| mambaforge | 24.7.1-0 | [BSD-3-Clause](https://github.com/conda-forge/miniforge/blob/main/LICENSE) | [MiniForge](https://github.com/conda-forge/miniforge) -| python | 3.12.5 | [PSF](https://docs.python.org/3.10/license.html) | [Python.org](https://www.python.org) +| Miniforge3 | 26.1.1-3 | [BSD-3-Clause](https://github.com/conda-forge/miniforge/blob/main/LICENSE) | [MiniForge3](https://github.com/conda-forge/miniforge) +| python | 3.13.12 | [PSF](https://docs.python.org/3.10/license.html) | [Python.org](https://www.python.org) ## Building/rebuilding containers