Skip to content

Commit a01e03f

Browse files
committed
Switch to clang 20
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
1 parent 7902b9d commit a01e03f

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

dependencies.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,17 +168,12 @@ dependencies:
168168
match: "^version: "
169169

170170
- name: clang
171-
version: 18
171+
version: 20
172172
refPaths:
173173
- path: nix/derivation-bpf.nix
174174
match: llvmPackages_\d+.clang-unwrapped
175175
- path: nix/derivation-bpf.nix
176176
match: llvm_\d+
177-
178-
# TODO: update to the latest clang of debian 12 packages are available.
179-
- name: clang-debian-12
180-
version: 16
181-
refPaths:
182177
- path: hack/pull-security-profiles-operator-verify
183178
match: CLANG_VERSION
184179

hack/install-packages

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ apt-get install -y \
77
libapparmor-dev \
88
libelf-dev \
99
libseccomp-dev \
10-
libzstd-dev
10+
libzstd-dev \
11+
lsb-release
1112

1213
./hack/install-libbpf.sh

hack/pull-security-profiles-operator-verify

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ set -euo pipefail
33

44
./hack/install-packages
55

6-
CLANG_VERSION=16
7-
apt-get install -y software-properties-common
6+
CLANG_VERSION=20
87
curl -sSfL --retry 5 --retry-delay 3 https://apt.llvm.org/llvm.sh | bash -s -- $CLANG_VERSION all
98
ln -sf /usr/bin/clang-format-$CLANG_VERSION /usr/bin/clang-format
109

nix/derivation-bpf.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ with pkgs; buildGoModule rec {
88
outputs = [ "out" ];
99
nativeBuildInputs = with buildPackages; [
1010
git
11-
llvmPackages_18.clang-unwrapped
12-
llvm_18
11+
llvmPackages_20.clang-unwrapped
12+
llvm_20
1313
pkg-config
1414
which
1515
];

0 commit comments

Comments
 (0)