Skip to content

Commit df39e52

Browse files
container: Swap to tagged cache (#508)
* container: Swap to tagged cache * Revert checksum fix for broken cache * Update generated outputs on behalf of [@alecbcs] --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 24e246f commit df39e52

68 files changed

Lines changed: 1684 additions & 1751 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/releases/v2025.11/tutorial /mirror
21+
RUN rclone copy :s3:spack-binaries/v2025.11.0/tutorial /mirror
2222

2323
RUN chmod -R go+r /mirror
2424

outputs/basics.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ example basics/uninstall-zlib "spack uninstall -y zlib-ng %gcc@10"
8282

8383
example basics/find-lf-zlib "spack find -lf zlib-ng"
8484

85-
zlib_hash="$(spack find --format '{hash:3}' zlib-ng@2.0.7 %clang ^gmake%gcc@10.5)"
85+
zlib_hash="$(spack find --format '{hash:3}' zlib-ng@2.0.7 %clang)"
8686
example --expect-error basics/uninstall-needed "spack uninstall zlib-ng/$zlib_hash"
8787
example basics/uninstall-r-needed "spack uninstall -y -R zlib-ng/$zlib_hash"
8888

outputs/basics/clone.out

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Cloning into '/home/spack/spack'...
33
remote: Enumerating objects: 2340, done.K
44
remote: Counting objects: 100% (2340/2340), done.K
55
remote: Compressing objects: 100% (1583/1583), done.K
6-
remote:nTotale2340 (delta2312),3reused 1328 (delta 237), pack-reused 0 (from 0)K
7-
Receiving objects: 100% (2340/2340), 5.30 MiB | 18.45 MiB/s, done.
8-
Resolving deltas: 100% (312/312), done.
6+
remote:nTotale2340 (delta2311),3reused 1329 (delta 237), pack-reused 0 (from 0)K
7+
Receiving objects: 100% (2340/2340), 5.30 MiB | 20.17 MiB/s, done.
8+
Resolving deltas: 100% (311/311), done.
99
$ cd ~/spack

outputs/basics/find-d-tcl.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ tcl@8.6.17
44
compiler-wrapper@1.0
55
glibc@2.35
66
gmake@4.4.1
7-
gcc@10.5.0
8-
gcc-runtime@10.5.0
7+
gcc@11.4.0
8+
gcc-runtime@11.4.0
99
llvm@14.0.0
1010
zlib-ng@2.0.7
1111

outputs/basics/find-d-trilinos.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ trilinos@16.1.0
77
mbedtls@2.28.9
88
nghttp2@1.48.0
99
diffutils@3.12
10+
openssl@3.6.0
11+
ca-certificates-mozilla@2025-08-12
1012
ncurses@6.5-20250705
1113
zlib-ng@2.0.7
1214
compiler-wrapper@1.0
@@ -30,8 +32,6 @@ trilinos@16.1.0
3032
libsigsegv@2.14
3133
automake@1.16.5
3234
libevent@2.1.12
33-
openssl@3.6.0
34-
ca-certificates-mozilla@2025-08-12
3535
libtool@2.4.7
3636
findutils@4.10.0
3737
gettext@0.23.1

outputs/basics/find-ldf-2.out

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -100,22 +100,14 @@ qlavhjb zlib-ng@2.0.7 cflags=-O3
100100

101101

102102
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
103-
jtvri57 tcl@8.6.17
103+
ibbzvxt tcl@8.6.17
104104
ntccuj2 compiler-wrapper@1.0
105105
qg7qyaz glibc@2.35
106-
ufbescp gmake@4.4.1
107-
ntkvysy gcc@10.5.0
108-
ahapkrs gcc-runtime@10.5.0
109-
qr2e4rd llvm@14.0.0
110-
wbmduay zlib-ng@2.0.7
111-
112-
wbmduay zlib-ng@2.0.7
113-
ntccuj2 compiler-wrapper@1.0
114-
qg7qyaz glibc@2.35
115-
ufbescp gmake@4.4.1
116-
ntkvysy gcc@10.5.0
117-
ahapkrs gcc-runtime@10.5.0
106+
4obn7cg gmake@4.4.1
107+
ml7cem5 gcc@11.4.0
108+
nokfxva gcc-runtime@11.4.0
118109
qr2e4rd llvm@14.0.0
110+
um7p6tr zlib-ng@2.0.7
119111

120112
um7p6tr zlib-ng@2.0.7
121113
ntccuj2 compiler-wrapper@1.0
@@ -183,15 +175,17 @@ qg7qyaz glibc@2.35
183175
ncdxq3j ncurses@6.5-20250705
184176
zk6kesh zlib-ng@2.2.4
185177

186-
6mcg35z cmake@3.31.9
178+
ivvor7v cmake@3.31.9
187179
ntccuj2 compiler-wrapper@1.0
188-
6uqd6hx curl@8.15.0
180+
isdtvvd curl@8.15.0
189181
txa2olx libssh2@1.11.1
190182
yzaocbs xz@5.6.3
191183
bz3ghzh mbedtls@2.28.9
192184
ft5kpbd nghttp2@1.48.0
193185
cih4xrz diffutils@3.12
194186
qtepnkr libiconv@1.18
187+
gv7wpik openssl@3.6.0
188+
etqlnw5 ca-certificates-mozilla@2025-08-12
195189
62kt5y4 perl@5.42.0
196190
vdgigsw berkeley-db@18.1.40
197191
x7t4naj bzip2@1.0.8
@@ -225,7 +219,7 @@ ncdxq3j ncurses@6.5-20250705
225219
f4qiprw pkgconf@2.5.1
226220
zk6kesh zlib-ng@2.2.4
227221

228-
6uqd6hx curl@8.15.0
222+
isdtvvd curl@8.15.0
229223
ntccuj2 compiler-wrapper@1.0
230224
ml7cem5 gcc@11.4.0
231225
nokfxva gcc-runtime@11.4.0
@@ -237,6 +231,8 @@ bz3ghzh mbedtls@2.28.9
237231
ft5kpbd nghttp2@1.48.0
238232
cih4xrz diffutils@3.12
239233
qtepnkr libiconv@1.18
234+
gv7wpik openssl@3.6.0
235+
etqlnw5 ca-certificates-mozilla@2025-08-12
240236
62kt5y4 perl@5.42.0
241237
vdgigsw berkeley-db@18.1.40
242238
x7t4naj bzip2@1.0.8
@@ -653,15 +649,17 @@ ml7cem5 gcc@11.4.0
653649
nokfxva gcc-runtime@11.4.0
654650
qg7qyaz glibc@2.35
655651

656-
uf7eixq hdf5@1.14.6
657-
6mcg35z cmake@3.31.9
658-
6uqd6hx curl@8.15.0
652+
7mm6knn hdf5@1.14.6
653+
ivvor7v cmake@3.31.9
654+
isdtvvd curl@8.15.0
659655
txa2olx libssh2@1.11.1
660656
yzaocbs xz@5.6.3
661657
bz3ghzh mbedtls@2.28.9
662658
ft5kpbd nghttp2@1.48.0
663659
cih4xrz diffutils@3.12
664660
qtepnkr libiconv@1.18
661+
gv7wpik openssl@3.6.0
662+
etqlnw5 ca-certificates-mozilla@2025-08-12
665663
62kt5y4 perl@5.42.0
666664
vdgigsw berkeley-db@18.1.40
667665
x7t4naj bzip2@1.0.8
@@ -676,14 +674,16 @@ qg7qyaz glibc@2.35
676674
f4qiprw pkgconf@2.5.1
677675
qlavhjb zlib-ng@2.0.7 cflags=-O3
678676

679-
ifyxhz6 hdf5@1.14.6
680-
6mcg35z cmake@3.31.9
681-
6uqd6hx curl@8.15.0
677+
vllfzb7 hdf5@1.14.6
678+
ivvor7v cmake@3.31.9
679+
isdtvvd curl@8.15.0
682680
txa2olx libssh2@1.11.1
683681
yzaocbs xz@5.6.3
684682
bz3ghzh mbedtls@2.28.9
685683
ft5kpbd nghttp2@1.48.0
686684
cih4xrz diffutils@3.12
685+
gv7wpik openssl@3.6.0
686+
etqlnw5 ca-certificates-mozilla@2025-08-12
687687
ncdxq3j ncurses@6.5-20250705
688688
ntccuj2 compiler-wrapper@1.0
689689
ml7cem5 gcc@11.4.0
@@ -701,8 +701,6 @@ hwxnwvm util-macros@1.20.1
701701
5trxrsw libxml2@2.13.5
702702
qtepnkr libiconv@1.18
703703
lprginh libevent@2.1.12
704-
gv7wpik openssl@3.6.0
705-
etqlnw5 ca-certificates-mozilla@2025-08-12
706704
yt7ajy4 libtool@2.4.7
707705
irvryts findutils@4.10.0
708706
cakgj4n gettext@0.23.1
@@ -1261,4 +1259,4 @@ ml7cem5 gcc@11.4.0
12611259
nokfxva gcc-runtime@11.4.0
12621260
qg7qyaz glibc@2.35
12631261

1264-
==> 88 installed packages
1262+
==> 87 installed packages

outputs/basics/find-ldf.out

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,14 @@ vjnqll7 glibc@2.35
66

77

88
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
9-
jtvri57 tcl@8.6.17
9+
ibbzvxt tcl@8.6.17
1010
ntccuj2 compiler-wrapper@1.0
1111
qg7qyaz glibc@2.35
12-
ufbescp gmake@4.4.1
13-
ntkvysy gcc@10.5.0
14-
ahapkrs gcc-runtime@10.5.0
15-
qr2e4rd llvm@14.0.0
16-
wbmduay zlib-ng@2.0.7
17-
18-
wbmduay zlib-ng@2.0.7
19-
ntccuj2 compiler-wrapper@1.0
20-
qg7qyaz glibc@2.35
21-
ufbescp gmake@4.4.1
22-
ntkvysy gcc@10.5.0
23-
ahapkrs gcc-runtime@10.5.0
12+
4obn7cg gmake@4.4.1
13+
ml7cem5 gcc@11.4.0
14+
nokfxva gcc-runtime@11.4.0
2415
qr2e4rd llvm@14.0.0
16+
um7p6tr zlib-ng@2.0.7
2517

2618
um7p6tr zlib-ng@2.0.7
2719
ntccuj2 compiler-wrapper@1.0
@@ -126,4 +118,4 @@ qg7qyaz glibc@2.35
126118

127119
qr2e4rd llvm@14.0.0
128120

129-
==> 22 installed packages
121+
==> 21 installed packages

outputs/basics/find-lf-zlib.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ spack find -lf zlib-ng
22
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
3-
wbmduay zlib-ng@2.0.7 um7p6tr zlib-ng@2.0.7 ct2r7xm zlib-ng@2.2.4
3+
um7p6tr zlib-ng@2.0.7 ct2r7xm zlib-ng@2.2.4
44

55
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
66
qlavhjb zlib-ng@2.0.7 cflags=-O3 zk6kesh zlib-ng@2.2.4
7-
==> 5 installed packages
7+
==> 4 installed packages

outputs/basics/find-px.out

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ $ spack find -px
33
trilinos@16.1.0 /home/spack/spack/opt/spack/linux-x86_64_v3/trilinos-16.1.0-k3ozjlurkcq33qpoqses4strvmxtexpe
44

55
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
6-
zlib-ng@2.0.7 /home/spack/spack/opt/spack/linux-x86_64_v3/zlib-ng-2.0.7-um7p6trqwrnsqapkzk5la2aqzcqky2dz
76
zlib-ng@2.2.4 /home/spack/spack/opt/spack/linux-x86_64_v3/zlib-ng-2.2.4-ct2r7xmldphegkos5g43flc6lm2nltcd
87

98
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
@@ -13,7 +12,7 @@ zlib-ng@2.0.7 /home/spack/spack/opt/spack/linux-x86_64_v3/zlib-ng-2.0.7-qlavhjb
1312

1413
-- linux-ubuntu22.04-x86_64_v3 / %c=gcc@11.4.0 ------------------
1514
gmake@4.4.1 /home/spack/spack/opt/spack/linux-x86_64_v3/gmake-4.4.1-vsq3oi374trwzuwcxzutihi2zbxrhosh
16-
hdf5@1.14.6 /home/spack/spack/opt/spack/linux-x86_64_v3/hdf5-1.14.6-uf7eixqrlzpzwhx477i5vywc3y7whizm
17-
hdf5@1.14.6 /home/spack/spack/opt/spack/linux-x86_64_v3/hdf5-1.14.6-ifyxhz6mtbbm55cucd23mbqj3d2qqe3c
15+
hdf5@1.14.6 /home/spack/spack/opt/spack/linux-x86_64_v3/hdf5-1.14.6-7mm6knnnjxquabuuhme4sjpe6d6vfawh
16+
hdf5@1.14.6 /home/spack/spack/opt/spack/linux-x86_64_v3/hdf5-1.14.6-vllfzb7aaz52qw5k2rkqq64glpglw5gv
1817
hdf5@1.14.6 /home/spack/spack/opt/spack/linux-x86_64_v3/hdf5-1.14.6-gdk3ghc3gh5rpxoztushxjuvto5prlqd
19-
==> 10 installed packages
18+
==> 9 installed packages

outputs/basics/find-zlib.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
$ spack find zlib-ng
22
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=clang@14.0.0 ------------
3-
zlib-ng@2.0.7 zlib-ng@2.0.7 zlib-ng@2.2.4
3+
zlib-ng@2.0.7 zlib-ng@2.2.4
44

55
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@10.5.0 --------------
66
zlib-ng@2.2.4
77

88
-- linux-ubuntu22.04-x86_64_v3 / %c,cxx=gcc@11.4.0 --------------
99
zlib-ng@2.0.7 zlib-ng@2.2.4
10-
==> 6 installed packages
10+
==> 5 installed packages

0 commit comments

Comments
 (0)