Skip to content

Commit a02aad5

Browse files
authored
install-dependencies.sh: set GCC version to 15 and LLVM to 21 (#89)
Currently we cross-compile aarch64 and s390x, so installing build dependencies and Linux mirror repo only makes sense for x86_64. Signed-off-by: Ihor Solodrai <[email protected]>
1 parent d1ec346 commit a02aad5

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

install-dependencies.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,25 @@
33
set -euo pipefail
44

55
# Most of the BPF CI dependencies are set up by libbpf/ci/setup-build-env action
6-
# This script runs a subset of it, in order to cache the packages at image build time
6+
# This script runs a subset of that, in order to cache the packages at image build time
77
export LIBBPF_CI_TAG=v3
88

99
# These should correspond to https://github.com/kernel-patches/vmtest/blob/master/.github/scripts/matrix.py#L20-L21
1010
# Otherwise there is no point in caching dependencies in the image
11-
export GCC_VERSION=14
12-
export LLVM_VERSION=20
11+
export GCC_VERSION=15
12+
export LLVM_VERSION=21
13+
14+
# do not install pahole and cross-compilation toolchain in the docker image
15+
export TARGET_ARCH=$(uname -m)
16+
export PAHOLE_BRANCH=none
1317

1418
scratch=$(mktemp -d)
1519
cd $scratch
16-
1720
git clone --depth 1 --branch $LIBBPF_CI_TAG https://github.com/libbpf/ci.git actions
18-
cd actions
19-
./setup-build-env/install_packages.sh
20-
./setup-build-env/install_clang.sh
21-
./run-vmtest/install-dependencies.sh
2221

23-
# do not install pahole and cross-compilation toolchain in the docker image
22+
# Install build dependencies only on x86_64, we cross-compile everything else
23+
if [ "$(uname -m)" == "x86_64" ]; then
24+
cd "${scratch}/actions/setup-build-env" && ./action.sh
25+
fi
26+
27+
cd "${scratch}/actions/run-vmtest" && ./install-dependencies.sh

setup-mirror-repos.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
set -euo pipefail
44

5+
if [ "$(uname -m)" != "x86_64" ]; then
6+
echo "Skip setting up mirror repos in non-x86_64 image"
7+
exit 0
8+
fi
9+
510
mkdir -p /libbpfci/mirrors
611
git clone https://github.com/kernel-patches/bpf.git /libbpfci/mirrors/linux
712
chmod -R a+rX /libbpfci/mirrors

0 commit comments

Comments
 (0)