From ccb2edaffbb01bd6fabfff4448c46c27dabb6b9c Mon Sep 17 00:00:00 2001 From: Jusong Yu Date: Mon, 17 Jun 2024 00:27:37 +0200 Subject: [PATCH] Use short version in openmpi version set (#4) --- .github/workflows/publish.yml | 4 ++-- bm-openmpi/Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9b64831..4a227d7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -61,12 +61,12 @@ jobs: env: ${{ fromJSON(steps.build_vars.outputs.vars) }} with: # e.g. ghcr.io/cnts4sci/bm - # type=raw,value=python-${{ env.PYTHON_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') }} images: ${{ inputs.registry }}/${{ github.repository_owner }}/${{ matrix.target }} tags: | - type=ref,event=pr type=edge,enable={{is_default_branch}} type=match,pattern=v(\d{4}\.\d{4}(-.+)?),group=1 + type=raw,value=qe-${{ env.OPENMPI_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && endsWith(matrix.target, 'openmpi') }} + type=raw,value=qe-${{ env.LAPACK_VERSION }},enable=${{ github.ref_type == 'tag' && startsWith(github.ref_name, 'v') && endsWith(matrix.target, 'lapack') }} - name: Determine source image id: images diff --git a/bm-openmpi/Dockerfile b/bm-openmpi/Dockerfile index c9e5556..2e3a958 100644 --- a/bm-openmpi/Dockerfile +++ b/bm-openmpi/Dockerfile @@ -6,8 +6,7 @@ FROM base-image AS openmpi-builder WORKDIR /openmpi-build ARG OPENMPI_VERSION -# TODO: v4.1 -< OPENMPI_MAJOR_MINOR_VERSION -RUN wget -c -O openmpi.tar.gz https://download.open-mpi.org/release/open-mpi/v4.1/openmpi-${OPENMPI_VERSION}.tar.gz && \ +RUN wget -c -O openmpi.tar.gz https://download.open-mpi.org/release/open-mpi/v${OPENMPI_VERSION%.*}/openmpi-${OPENMPI_VERSION}.tar.gz && \ mkdir -p openmpi && \ tar xf openmpi.tar.gz -C openmpi --strip-components=1 && \ cd openmpi && \