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

40181b38

Commit 40181b38 authored 1 year ago by Wouter Deconinck

Downloads
- Plain Diff

Merge branch 'master' into 'root-6.28.04'

# Conflicts:
#   spack-environment/dev/spack.yaml

parents 8b51e94c acaf8fd9

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 2 additions, 0 deletions

.gitlab-ci.yml
containers/jug/dev.Dockerfile 20 additions, 18 deletions

containers/jug/dev.Dockerfile
spack-environment/concretizer.yaml 7 additions, 1 deletion

spack-environment/concretizer.yaml
spack-environment/dev/spack.yaml 72 additions, 81 deletions

spack-environment/dev/spack.yaml
spack-environment/packages.yaml 276 additions, 2 deletions

spack-environment/packages.yaml
spack.sh 2 additions, 0 deletions

spack.sh

with 379 additions and 102 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