Skip to content
Snippets Groups Projects
Commit 7e32cbd0 authored by Sylvester Joosten's avatar Sylvester Joosten
Browse files

Merge branch 'master' into develop

parents 13a23388 208c09a5
Branches
No related tags found
1 merge request!10New v2.2.0 release version
...@@ -9,7 +9,7 @@ stages: ...@@ -9,7 +9,7 @@ stages:
builder_stable: builder_stable:
stage: builder stage: builder
tags: tags:
- sodium dind - silicon
only: only:
- tags - tags
- master - master
...@@ -22,7 +22,7 @@ builder_stable: ...@@ -22,7 +22,7 @@ builder_stable:
builder_unstable: builder_unstable:
stage: builder stage: builder
tags: tags:
- sodium dind - silicon
except: except:
- tags - tags
- master - master
...@@ -39,7 +39,7 @@ config_stable: ...@@ -39,7 +39,7 @@ config_stable:
image: eicweb.phy.anl.gov:4567/containers/eic_container/eic_builder:latest image: eicweb.phy.anl.gov:4567/containers/eic_container/eic_builder:latest
stage: config stage: config
tags: tags:
- sodium dind - silicon
only: only:
- tags - tags
- master - master
...@@ -55,7 +55,7 @@ config_unstable: ...@@ -55,7 +55,7 @@ config_unstable:
image: eicweb.phy.anl.gov:4567/containers/eic_container/eic_builder:unstable image: eicweb.phy.anl.gov:4567/containers/eic_container/eic_builder:unstable
stage: config stage: config
tags: tags:
- sodium dind - silicon
except: except:
- tags - tags
- master - master
...@@ -71,7 +71,7 @@ config_unstable: ...@@ -71,7 +71,7 @@ config_unstable:
release_stable: release_stable:
stage: main stage: main
tags: tags:
- sodium dind - silicon
only: only:
- tags - tags
- master - master
...@@ -85,7 +85,7 @@ release_stable: ...@@ -85,7 +85,7 @@ release_stable:
release_unstable: release_unstable:
stage: main stage: main
tags: tags:
- sodium dind - silicon
except: except:
- tags - tags
- master - master
...@@ -132,6 +132,7 @@ release_singularity: ...@@ -132,6 +132,7 @@ release_singularity:
- cp eic.sif build/. - cp eic.sif build/.
- cp eic.def build/. - cp eic.def build/.
artifacts: artifacts:
expire_in: 90 days # this will change in future gitlab vesions :https://docs.gitlab.com/13.3/ee/ci/yaml/README.html#artifactsexpire_in
paths: paths:
- build/eic.sif - build/eic.sif
- build/eic.def - build/eic.def
2.1.3 2.1.5
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment