diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e78d584d0ff835bab4c689c0c07786045087a63..577abda1e7c0fabb50f88085639f68fd7249a71a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,7 +31,7 @@ builder_unstable: - cd containers/builder - head Dockerfile - make login - - make develop-cached + - make develop ## I wish there were a simple way to transfer the "latest/unstable" strings ## between jobs... diff --git a/README.md b/README.md index da787b95d6a912fe975c7b566c83017c34ebc0c1..21bd852a4d94bb103bf70b4e0ff24e63cd6edc6b 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,9 @@ cd eic_container modeuefile will be installed to `$PREFIX/../../etc/modulefiles`. You can use the `-v` flag to select the version you want to deploy, or omit the flag if you want to install the master build. The recommended stable - release version is `v2.1.2`. + release version is `v2.1.3`. ```bash -./deploy.py -v 2.1.2 <PREFIX> +./deploy.py -v 2.1.3 <PREFIX> ``` Available flags: @@ -117,8 +117,8 @@ Included software: - podio@master - geant4@10.6.2 - dd4hep@1.13.1 - - acts@0.30.0 - - gaudi@33.2 + - acts@0.31.0 + - gaudi@34.0 - The singularity build exports the following applications: - eic_shell: a development shell in the image - container_dev: same as EIC shell diff --git a/VERSION b/VERSION index eca07e4c1a8cbc603e5d5c2885dc0f0f9b1eef8d..ac2cdeba0137a6c2cbca06867b7ab994a913e294 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.2 +2.1.3 diff --git a/containers/builder/Dockerfile b/containers/builder/Dockerfile index 82ac5f64e9b42979e9ead9004acc8de9b9f84bae..c9428663b2d530e26a03770155201b33978f41e6 100644 --- a/containers/builder/Dockerfile +++ b/containers/builder/Dockerfile @@ -19,6 +19,7 @@ ENV DOCKERFILE_BASE=ubuntu \ ## Ensure an up-to-date custom package list RUN rm -rf $SPACK_ROOT/np-spack \ + && echo "Update spack for v2.1.3" \ && git clone https://eicweb.phy.anl.gov/EIC/np-spack.git $SPACK_ROOT/np-spack \ && cd $SPACK_ROOT/np-spack && git checkout v`spack --version` && cd - \ && rm -rf $SPACK_ROOT/np-spack/.git \ diff --git a/containers/builder/Makefile b/containers/builder/Makefile index 53a827dbc53508a83b8d236d1cfb7000502bcc74..a59ed20bfe683653af7447435414d8e082e00514 100644 --- a/containers/builder/Makefile +++ b/containers/builder/Makefile @@ -83,7 +83,7 @@ release: build-nc publish ## Make a release by building and publishing the `{ver develop: build-nc publish-dev ## Develop build, do not publish latest @echo "Cleaning up" - docker rmi $(APP_NAME):unstable + #docker rmi $(APP_NAME):latest release-cached: build publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR develop-cached: build login publish-dev ## develop release diff --git a/containers/builder/spack.yaml b/containers/builder/spack.yaml index 579065a5466a86e4fc472e2e941db7990ad2a9fc..532e2add5589c06be29d15a0cfe82ac029fc3bea 100644 --- a/containers/builder/spack.yaml +++ b/containers/builder/spack.yaml @@ -19,8 +19,8 @@ spack: - podio@master - geant4@10.6.2 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl - dd4hep@1.13.1 +geant4 +assimp +hepmc3 - - acts@0.30.0 +dd4hep +digitization +identification +json +tgeo - - gaudi@33.2 + - acts@0.31.0 +dd4hep +digitization +identification +json +tgeo + - gaudi@34.0 concretization: together config: install_tree: /opt/software diff --git a/containers/release/Makefile b/containers/release/Makefile index 53a827dbc53508a83b8d236d1cfb7000502bcc74..5bb4a31e34384d48b86e5be4ca4b3c1e8a3a3c1e 100644 --- a/containers/release/Makefile +++ b/containers/release/Makefile @@ -79,11 +79,11 @@ login: ## Auto login to AWS-ECR unsing aws-cli release: build-nc publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR @echo "Cleaning up" - docker rmi $(APP_NAME):latest + #docker rmi $(APP_NAME):latest develop: build-nc publish-dev ## Develop build, do not publish latest @echo "Cleaning up" - docker rmi $(APP_NAME):unstable + #docker rmi $(APP_NAME):latest release-cached: build publish ## Make a release by building and publishing the `{version}` ans `latest` tagged containers to ECR develop-cached: build login publish-dev ## develop release