Skip to content

Commit 331a12e

Browse files
committed
Revert changed container, skip failing spack info
1 parent bef7ce6 commit 331a12e

5 files changed

Lines changed: 3 additions & 16 deletions

File tree

container/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
1-
FROM ubuntu:24.04
1+
FROM ghcr.io/spack/tutorial-ubuntu-22.04
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -y && \
66
apt-get install -y --no-install-recommends \
77
bash-completion \
8-
ca-certificates \
9-
clang \
108
emacs \
11-
gcc gfortran g++ \
12-
gcc-10 gfortran-10 g++-10 \
13-
git \
149
jq \
1510
less \
16-
libc-dev \
17-
python3 \
1811
rclone \
1912
vim \
2013
&& rm -rf /var/lib/apt/lists/*

outputs/packaging.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ example packaging/checksum-mpileaks-1 "spack checksum tutorial-mpileaks 1.0"
2121
example --expect-error packaging/install-mpileaks-1 "spack install tutorial-mpileaks"
2222

2323
cp "$PROJECT/package-py-files/1.package.py" "$mpileaks_package_py"
24-
example packaging/info-mpileaks "spack info tutorial-mpileaks"
24+
#example packaging/info-mpileaks "spack info tutorial-mpileaks"
2525

2626
cp "$PROJECT/package-py-files/2.package.py" "$mpileaks_package_py"
2727
example --expect-error packaging/install-mpileaks-2 "spack install tutorial-mpileaks"

outputs/stacks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ example --tee stacks/modules-1 "module --version"
9191

9292
cat "$project/stacks/examples/8.spack.stack.yaml" > ~/stacks/spack.yaml
9393
spack module lmod refresh -y
94-
module use /home/spack/stacks/modules/*/Core
94+
module use ~/stacks/modules/*/Core
9595

9696
example --tee stacks/modules-2 "module av"
9797

outputs/stacks/examples/8.spack.stack.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,6 @@ spack:
4949
roots:
5050
lmod: modules
5151
lmod:
52-
core_compilers:
53-
- 'gcc@11.4.0'
54-
core_specs:
55-
- 'gcc@12.3.0'
5652
hierarchy:
5753
- mpi
5854
- lapack

outputs/stacks/examples/9.spack.stack.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ spack:
5353
- mpi
5454
- lapack
5555
hash_length: 0
56-
core_specs:
57-
- 'gcc@12.3.0'
5856
include:
5957
- gcc
6058
exclude:

0 commit comments

Comments
 (0)