summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarmen Stoppels <me@harmenstoppels.nl>2023-10-31 12:58:33 +0100
committerGitHub <noreply@github.com>2023-10-31 12:58:33 +0100
commit6933e1c3cbba4bfb92296459fc8d5d125ef262e7 (patch)
tree6ce6ee850130b43a162e4b6241bc1df9715995d4
parent160bfd881ddcb32a9b0fa1bd6eabe2f70b9bba41 (diff)
downloadspack-6933e1c3cbba4bfb92296459fc8d5d125ef262e7.tar.gz
spack-6933e1c3cbba4bfb92296459fc8d5d125ef262e7.tar.bz2
spack-6933e1c3cbba4bfb92296459fc8d5d125ef262e7.tar.xz
spack-6933e1c3cbba4bfb92296459fc8d5d125ef262e7.zip
ci: bump tutorial image and toolchain (#40795)
-rw-r--r--share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml2
-rw-r--r--share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml14
2 files changed, 8 insertions, 8 deletions
diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
index 196037585f..880aeb6811 100644
--- a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
+++ b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -621,7 +621,7 @@ aws-isc-aarch64-build:
tutorial-generate:
extends: [ ".tutorial", ".generate-x86_64"]
- image: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-05-07
+ image: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30
tutorial-build:
extends: [ ".tutorial", ".build" ]
diff --git a/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
index 9e43de3cf0..1ff435bc9b 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/tutorial/spack.yaml
@@ -18,26 +18,26 @@ spack:
- hdf5+hl+mpi ^mpich
- trilinos
- trilinos +hdf5 ^hdf5+hl+mpi ^mpich
- - gcc@12.1.0
+ - gcc@12
- mpileaks
- lmod
- macsio@1.1+scr ^scr@2.0.0~fortran ^silo~fortran ^hdf5~fortran
- - ['%gcc@11.3.0']
+ - ['%gcc@11']
- gcc_old_packages:
- - gmake%gcc@10.4.0
+ - gmake%gcc@10
- clang_packages:
- matrix:
- [gmake, tcl ^gmake@4.3]
- - ['%clang@14.0.0']
+ - ['%clang@14']
- gcc_spack_built_packages:
- matrix:
- [netlib-scalapack]
- [^mpich, ^openmpi]
- [^openblas, ^netlib-lapack]
- - ['%gcc@12.1.0']
+ - ['%gcc@12']
- matrix:
- [py-scipy ^openblas, armadillo ^openblas, netlib-lapack, openmpi, mpich, elpa ^mpich]
- - ['%gcc@12.1.0']
+ - ['%gcc@12']
specs:
- $gcc_system_packages
- $gcc_old_packages
@@ -48,7 +48,7 @@ spack:
pipeline-gen:
- build-job:
image:
- name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-05-07
+ name: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-10-30
entrypoint: ['']
cdash:
build-group: Spack Tutorial