diff --git a/.github/workflows/container_build.yml b/.github/workflows/container_build.yml index 6378487..09570ea 100644 --- a/.github/workflows/container_build.yml +++ b/.github/workflows/container_build.yml @@ -30,8 +30,8 @@ jobs: type=ref,event=pr type=pep440,pattern={{version}} type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} + type=semver,pattern={{major}}.{{minor}} type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Set up QEMU @@ -54,6 +54,7 @@ jobs: tags: ${{ env.LATEST_TAG }} file: ./dockerfiles/container_template/Dockerfile + 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 + platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/container_build_push.yml b/.github/workflows/container_build_push.yml index f623320..e74af7e 100644 --- a/.github/workflows/container_build_push.yml +++ b/.github/workflows/container_build_push.yml @@ -27,8 +27,8 @@ jobs: type=ref,event=pr type=pep440,pattern={{version}} type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} + type=semver,pattern={{major}}.{{minor}} type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Set up QEMU @@ -82,7 +82,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} file: ./dockerfiles/container_template/Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 build-apptainer-container: needs: docker @@ -114,8 +114,8 @@ jobs: type=ref,event=pr type=pep440,pattern={{version}} type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} type=semver,pattern={{major}} + type=semver,pattern={{major}}.{{minor}} type=sha type=raw,value=latest,enable={{is_default_branch}} - name: Build and push Apptainer container 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 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 = ""