diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1aaee5cb65809dc226fc42f5ba8cb3fe47f1ad62..a8f4b2d5b5827d8fc65fe64d92165593cc6b2d3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,13 +36,15 @@ variables: APPTAINER_EXEC_OPTIONS: ${apptainer_options} --bind ${BUILDCACHE}:/buildcache:rw --writable-tmpfs .setup_spack: - cache: - key: extra-repos-${environment} - paths: - - /stack/extra_repos before_script: - /opt/spack/bin/spack gpg trust $GPG_PRIVATE_KEY + - mkdir -p /stack/extra_repos + - cd /stack/extra_repos + + - git clone https://gitlab.epfl.ch/SCITAS/software-stack/spack-repo-externals.git + - git clone https://gitlab.epfl.ch/SCITAS/software-stack/scitas-spack-packages.git + # ------------------------------------------------------------------------------ spack:setup: stage: environment @@ -55,12 +57,6 @@ spack:setup: /opt/spack/bin/spack gpg publish -d /buildcache fi - - mkdir -p extra_repos - - cd extra_repos - - - git clone https://gitlab.epfl.ch/SCITAS/software-stack/spack-repo-externals.git - - git clone https://gitlab.epfl.ch/SCITAS/software-stack/scitas-spack-packages.git - spack:concretize: stage: concretize extends: diff --git a/repos.yaml b/repos.yaml index 0115ab60b46cdad5f459c11c68d88d418fb1569a..0b4a932ea856b09fb148d1ec87e817960282bcfe 100644 --- a/repos.yaml +++ b/repos.yaml @@ -1,3 +1,3 @@ repos: - - extra_repos/spack-repo-externals - - extra_repos/scitas-spack-packages + - /stack/extra_repos/spack-repo-externals + - /stack/extra_repos/scitas-spack-packages