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

3cd03347

Commit 3cd03347 authored 2 years ago by Wouter Deconinck

Downloads
- Plain Diff

Merge branch 'master' into 'wdconinc-master-patch-02750'

# Conflicts:
#   .gitlab-ci.yml
#   spack.yaml

parents 35592844 30eccfb8

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 8 additions, 1 deletion

.gitlab-ci.yml
containers/debian/base.Dockerfile 1 addition, 0 deletions

containers/debian/base.Dockerfile
containers/jug/dev.Dockerfile 1 addition, 1 deletion

containers/jug/dev.Dockerfile
containers/jug/requirements.txt 0 additions, 18 deletions

containers/jug/requirements.txt
spack.yaml 21 additions, 2 deletions

spack.yaml

with 31 additions and 22 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