Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

eic_container
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

534b9f9b

Commit 534b9f9b authored 1 year ago by Wouter Deconinck

Downloads
- Plain Diff

Merge branch 'master' into 'master-patch-0307'

# Conflicts:
#   .gitlab-ci.yml

parents 4cbf3ebc c4443ba0

Branches

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 72 additions, 24 deletions

.gitlab-ci.yml
containers/dind/Dockerfile 1 addition, 2 deletions

containers/dind/Dockerfile
containers/jug/dev.Dockerfile 2 additions, 3 deletions

containers/jug/dev.Dockerfile
containers/jug/eic-news 22 additions, 0 deletions

containers/jug/eic-news
containers/jug/setup_detectors.py 2 additions, 0 deletions

containers/jug/setup_detectors.py
containers/jug/xl.Dockerfile 5 additions, 0 deletions

containers/jug/xl.Dockerfile
detectors.yaml 0 additions, 11 deletions

detectors.yaml
eic-spack.sh 1 addition, 1 deletion

eic-spack.sh
spack-environment/dev/spack.yaml 2 additions, 1 deletion

spack-environment/dev/spack.yaml
spack.sh 1 addition, 1 deletion

spack.sh

with 108 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment