diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a5febf..7cdc608 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,12 @@ jobs: test-plugin: runs-on: ubuntu-latest + strategy: + matrix: + aiida-version: + - '2.4.3' + - '2.5.0' + timeout-minutes: 30 steps: @@ -35,6 +41,8 @@ jobs: tags: aiida_cp2k_test cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new + build-args: | + AIIDA_VERSION=2.4.3 # Temp fix # https://github.com/docker/build-push-action/issues/252 diff --git a/Dockerfile b/Dockerfile index e245149..9762664 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,9 @@ # For further information on the license, see the LICENSE.txt file. # ############################################################################### +ARG AIIDA_VERSION=2.5.0 -FROM aiidateam/aiida-core-with-services:2.5.0 +FROM aiidateam/aiida-core-with-services:${AIIDA_VERSION} # To prevent the container to exit prematurely. ENV KILL_ALL_RPOCESSES_TIMEOUT=50 diff --git a/README.md b/README.md index 498bf8a..cf6768b 100644 --- a/README.md +++ b/README.md @@ -53,10 +53,15 @@ Once this is done, you can build the Docker image with the following command: ```bash docker build -t aiida_cp2k_test . ``` +To test against another version of aiida-core, you can specify the build agrument `AIIDA_VERSION`: +```bash +docker build -t aiida_cp2k_test --build-arg AIIDA_VERSION=2.4.3 . +``` + Then, you can launch the container: ```bash -DOKERID=`docker run -d aiida_cp2k_test` +DOCKERID=`docker run -d aiida_cp2k_test` ``` This will remeber the container ID in the variable `DOKERID`. You can then run the tests with the following command: