Skip to content

Commit 3258f12

Browse files
authored
chore: clang-20 on trixie (non-cuda)
1 parent d191703 commit 3258f12

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

containers/debian/Dockerfile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,12 @@ mkdir -p /etc/apt/source.list.d
9292
case ${ID} in
9393
debian)
9494
case ${VERSION_CODENAME} in
95-
bookworm) GCC="-12" ; CLANG="-18" ;;
96-
trixie) GCC="-14" ; CLANG="-19" ;;
95+
trixie) GCC="-14" ; CLANG="-20" ;;
9796
*) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
9897
esac ;;
9998
ubuntu)
10099
echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/ppa/ubuntu/${VERSION_CODENAME} main" > /etc/apt/source.list.d/ubuntu-toolchain.list
101100
case ${VERSION_CODENAME} in
102-
focal) GCC="-10" ; CLANG="-16" ;;
103-
jammy) GCC="-12" ; CLANG="-16" ;;
104101
noble) GCC="-13" ; CLANG="-17" ;;
105102
*) echo "Unsupported VERSION_CODENAME=${VERSION_CODENAME}" ; exit 1 ;;
106103
esac ;;

spack-environment/packages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ packages:
242242
- '@2.1.0'
243243
iwyu:
244244
require:
245-
- '@0.23'
245+
- '@0.23:'
246246
jana2:
247247
require:
248248
- '@2.4.3'

0 commit comments

Comments
 (0)