Skip to content
Snippets Groups Projects
Commit 3f7b44ba authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: debug loading env; remove variables in spack.yaml

parent f3c1557c
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !410. Comments created here will be created in the context of that merge request.
...@@ -236,7 +236,7 @@ generate-pipeline: ...@@ -236,7 +236,7 @@ generate-pipeline:
- git clone https://github.com/${EICSPACK_ORGREPO}.git ${SPACK_ROOT}/var/spack/repos/eic-spack - git clone https://github.com/${EICSPACK_ORGREPO}.git ${SPACK_ROOT}/var/spack/repos/eic-spack
- git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION} - git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
script: script:
- spack env activate --without-view . - spack -d env activate --without-view .
- spack -d ci generate - spack -d ci generate
--artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir" --artifacts-root "${CI_PROJECT_DIR}/jobs_scratch_dir"
--output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/pipeline.yml" --output-file "${CI_PROJECT_DIR}/jobs_scratch_dir/pipeline.yml"
......
...@@ -68,22 +68,24 @@ spack: ...@@ -68,22 +68,24 @@ spack:
gitlab-ci: gitlab-ci:
before_script: before_script:
- git clone ${SPACK_REPO} spack - git clone https://github.com/${SPACK_ORGREPO}.git spack
- git -C spack checkout ${SPACK_VERSION} - git -C spack checkout ${SPACK_VERSION}
- . "./spack/share/spack/setup-env.sh" - . "./spack/share/spack/setup-env.sh"
- git clone ${EICSPACK_REPO} ${SPACK_ROOT}/var/spack/repos/eic-spack - git clone https://github.com/${EICSPACK_ORGREPO}.git spack/var/spack/repos/eic-spack
- git -C ${SPACK_ROOT}/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION} - git -C spack/var/spack/repos/eic-spack checkout ${EICSPACK_VERSION}
script: script:
- pushd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view . && popd - pushd ${SPACK_CONCRETE_ENV_DIR} && spack env activate --without-view . && popd
- spack -d ci rebuild - spack -d ci rebuild
mappings: mappings:
- match: - match: ["os=ubuntu20.04"]
- os=ubuntu20.04
runner-attributes: runner-attributes:
image: spack/ubuntu-focal image: spack/ubuntu-focal
- match: tags:
- os=ubuntu22.04 - docker-new
- match: ["os=ubuntu22.04"]
runner-attributes: runner-attributes:
image: spack/ubuntu-jammy image: spack/ubuntu-jammy
tags:
- docker-new
enable-artifacts-buildcache: False enable-artifacts-buildcache: False
rebuild-index: True rebuild-index: True
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment