Skip to content

Commit 106f55b

Browse files
alecbcsgithub-actions[bot]
alecbcs
and
github-actions[bot]
authored
ci: add support for v1.0 (#472)
* Add modifications for v1.0 * Pin repository for v2025.07.0 * Typo fix for update * Fix hanging uninstall with y * Drop running "spack tutorial" until fixed * Add version qualifier to GCC nodes * Fix gcc version used in path * Drop compilers from hdf5 spec * Bring back %c to describe in example * Fix example wording for spec * Revert %c=gcc * Disable Day 2 sections and rewrite basics around %c,cxx * Add repo update to basics section * Update generated outputs on behalf of [@alecbcs] --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent a38f43c commit 106f55b

75 files changed

Lines changed: 5408 additions & 4428 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎container/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/spack/tutorial-ubuntu-22.04:v2024-05-07
1+
FROM ghcr.io/spack/tutorial-ubuntu-22.04
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

@@ -18,7 +18,7 @@ RUN apt-get remove -y gcc-12
1818

1919
# Download the buildcache
2020
RUN mkdir /mirror
21-
RUN rclone copy :s3:spack-binaries/v0.23.1/tutorial /mirror
21+
RUN rclone copy :s3:spack-binaries/v2025.07.0/tutorial /mirror
2222

2323
RUN chmod -R go+r /mirror
2424

‎outputs/Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,20 @@ update-outputs: run
3434

3535
run: run-scripting
3636

37-
run-scripting: run-dev scripting.sh
37+
run-scripting: run-environments scripting.sh
3838
# run-cache: run-dev cache.sh
39-
run-dev: run-packaging dev.sh
40-
run-packaging: run-stacks packaging.sh
41-
run-stacks: run-environments stacks.sh
39+
# run-dev: run-packaging dev.sh
40+
# run-packaging: run-stacks packaging.sh
41+
# run-stacks: run-environments stacks.sh
4242
run-environments: run-basics environments.sh
4343
run-basics: basics.sh init_spack.sh defs.sh
4444

45-
local: local-scripting
46-
local-scripting: local-dev scripting.sh
45+
local: local-environments
46+
# local-scripting: local-dev scripting.sh
4747
# local-cache: local-dev cache.sh
48-
local-dev: local-packaging dev.sh
49-
local-packaging: local-stacks packaging.sh
50-
local-stacks: local-environments stacks.sh
48+
# local-dev: local-packaging dev.sh
49+
# local-packaging: local-stacks packaging.sh
50+
# local-stacks: local-environments stacks.sh
5151
local-environments: local-basics environments.sh
5252
local-basics: basics.sh init_spack.sh defs.sh
5353

‎outputs/basics.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ spack config add "config:suppress_gpg_warnings:true"
2121

2222
example basics/source-setup ". share/spack/setup-env.sh"
2323

24+
# pin repository to release
25+
example basics/repo "spack repo update builtin --tag $packages_release"
26+
2427
# spack list
2528
example basics/list "spack list"
2629
example basics/list-py "spack list 'py-*'"
@@ -59,7 +62,7 @@ example basics/hdf5-spec "spack spec hdf5"
5962
example basics/hdf5 "spack install hdf5"
6063
example basics/hdf5-no-mpi "spack install hdf5~mpi"
6164

62-
example basics/hdf5-hl-mpi "spack install hdf5+hl+mpi %c,cxx=gcc ^mpich"
65+
example basics/hdf5-hl-mpi "spack install hdf5+hl+mpi ^mpich"
6366

6467
example basics/find-ldf-2 "spack find -ldf"
6568

@@ -102,4 +105,4 @@ example basics/compilers-2 "spack compilers"
102105

103106
example basics/spec-zziplib "spack spec zziplib"
104107

105-
example basics/compiler-uninstall 'spack uninstall gcc@12'
108+
echo y | example basics/compiler-uninstall 'spack uninstall gcc@12'

‎outputs/basics/clone.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
$ git clone --depth=2 --branch=releases/v0.23 https://github.com/spack/spack.git ~/spack
1+
$ git clone --depth=2 --branch=releases/v1.0 https://github.com/spack/spack.git ~/spack
22
Cloning into '/home/spack/spack'...
3-
remote: Enumerating objects: 20971, done.K
4-
remote: Counting objects: 100% (20971/20971), done.K
5-
remote: Compressing objects: 100% (11448/11448), done.K
6-
remote:nTotale20971 (delta01801),9reused014170i(delta.1509),/pack-reused 0 (from 0)K
7-
Receiving objects: 100% (20971/20971), 14.78 MiB | 20.70 MiB/s, done.
8-
Resolving deltas: 100% (1801/1801), done.
3+
remote: Enumerating objects: 2294, done.K
4+
remote: Counting objects: 100% (2294/2294), done.K
5+
remote: Compressing objects: 100% (1547/1547), done.K
6+
remote:nTotale2294 (delta2305),2reused 1260 (delta 235), pack-reused 0 (from 0)K
7+
Receiving objects: 100% (2294/2294), 5.29 MiB | 19.99 MiB/s, done.
8+
Resolving deltas: 100% (305/305), done.
99
$ cd ~/spack

‎outputs/basics/compiler-list.out‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$ spack compilers
2+
==> Available compilers
3+
-- gcc ubuntu22.04-x86_64 ---------------------------------------
4+
[e] gcc@11.4.0 [e] gcc@10.5.0
5+
6+
-- llvm ubuntu22.04-x86_64 --------------------------------------
7+
[e] llvm@14.0.0

‎outputs/basics/compiler-uninstall.out‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
$ spack uninstall gcc@12
2+
y
3+
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
4+
fmxnit5 gcc@12.5.0
5+
6+
==> 1 packages will be uninstalled. Do you want to proceed? [y/N] ==> Successfully uninstalled gcc@12.5.0~binutils+bootstrap~graphite~mold~nvptx~piclibs~profiled~strip build_system=autotools build_type=RelWithDebInfo languages:='c,c++,fortran' arch=linux-ubuntu22.04-x86_64_v3/fmxnit5

‎outputs/basics/compilers-2.out‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$ spack compilers
2+
==> Available compilers
3+
-- gcc ubuntu22.04-x86_64 ---------------------------------------
4+
[e] gcc@11.4.0 [e] gcc@10.5.0 [+] gcc@12.5.0
5+
6+
-- llvm ubuntu22.04-x86_64 --------------------------------------
7+
[e] llvm@14.0.0

‎outputs/basics/compilers.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ spack compilers
22
==> Available compilers
3-
-- clang ubuntu22.04-x86_64 -------------------------------------
4-
clang@14.0.0
5-
63
-- gcc ubuntu22.04-x86_64 ---------------------------------------
7-
gcc@11.4.0 gcc@10.5.0
4+
[e] gcc@11.4.0 [e] gcc@10.5.0
5+
6+
-- llvm ubuntu22.04-x86_64 --------------------------------------
7+
[e] llvm@14.0.0

‎outputs/basics/find-O3.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
$ spack find cflags=-O3
2-
-- linux-ubuntu22.04-x86_64_v3 / gcc@11.4.0 ---------------------
2+
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
33
zlib-ng@2.0.7
44
==> 1 installed package

‎outputs/basics/find-d-tcl.out‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
$ spack find -d tcl
2-
-- linux-ubuntu22.04-x86_64_v3 / clang@14.0.0 -------------------
2+
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
33
tcl@8.6.12
4+
compiler-wrapper@1.0
45
glibc@2.35
56
gmake@4.4.1
7+
llvm@14.0.0
68
zlib-ng@2.0.7
79

810

9-
-- linux-ubuntu22.04-x86_64_v3 / gcc@11.4.0 ---------------------
11+
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
1012
tcl@8.6.12
13+
compiler-wrapper@1.0
14+
gcc@11.4.0
1115
gcc-runtime@11.4.0
1216
glibc@2.35
1317
gmake@4.4.1
1418
zlib-ng@2.0.7
1519

1620
tcl@8.6.12
21+
compiler-wrapper@1.0
22+
gcc@11.4.0
1723
gcc-runtime@11.4.0
1824
glibc@2.35
1925
gmake@4.4.1
20-
zlib-ng@2.2.1
26+
zlib-ng@2.2.4
2127

2228
==> 3 installed packages

0 commit comments

Comments
 (0)