From a0e1a29758d74b1de8f5379d24424f5f7e113416 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sylvester.joosten@gmail.com>
Date: Thu, 20 May 2021 02:49:40 +0000
Subject: [PATCH] Resolve "Set software versions for v3.0"
---
.gitlab-ci.yml | 12 ++++++------
README.md | 15 +++++++--------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd953c541..79c45e40a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,12 +2,12 @@ image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
variables:
## Application versions used for the main release ## note: nightly builds will always use the master branch
- JUGGLER_VERSION: "v1.5.0"
- NPDET_VERSION: "master"
- EICD_VERSION: "master"
- DETECTOR_VERSION: "master"
- IP6_VERSION: "master"
- ACCELERATOR_VERSION: "master"
+ JUGGLER_VERSION: "v1.6.0"
+ NPDET_VERSION: "v0.5.0"
+ EICD_VERSION: "v0.1.0"
+ DETECTOR_VERSION: "v0.1.0"
+ IP6_VERSION: "v0.1.0"
+ ACCELERATOR_VERSION: "master" #needs to be merged into IP6
## Spack github version
SPACK_VERSION: "63915de99b6d4bc7c8b8a22dc45e5c3dd7ee4f26"
diff --git a/README.md b/README.md
index 593418651..c6cda9eaf 100644
--- a/README.md
+++ b/README.md
@@ -22,19 +22,18 @@ cd eic_container
Available flags:
```bash
- -v VERSION, --version VERSION
- (opt.) project version. Default: current version (in repo).
+ -c CONTAINER, --container CONTAINER
+ (opt.) Container to install. D: eic (will migrate to jug_xl for v3.0).
+ -v VERSION, --version VERSION
+ (opt.) project version. D: 2.9.2. For MRs, use mr-XXX.
+ -f, --force Force-overwrite already downloaded container
-b BIND_PATHS, --bind-path BIND_PATHS
(opt.) extra bind paths for singularity.
-m MODULE_PATH, --module-path MODULE_PATH
- (opt.) Root module path where you want to install a
- modulefile. D: <prefix>/../../etc/modulefiles
- -l, --local Local install, will not install the modulefiles (you will have
- to run the launcher scripts from their relative paths).
- -f, --force Force-overwrite already downloaded container with the same name.
+ (opt.) Root module path to install a modulefile. D: Do not install a
+ modulefile
```
-
3. To use the container in installed mode, you can load the modulefile,
and then use the included apps as if they are native apps on your system!
```bash
--
GitLab