Skip to content

Commit ba92a60

Browse files
committed
chore: see if we can switch CI to ubuntu 24.04
1 parent 202e6f7 commit ba92a60

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

.docker/Dockerfile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
# syntax=docker/dockerfile:1
22
ARG ARCH=amd64
3-
FROM $ARCH/ubuntu:23.10
4-
RUN apt update && apt install -y gnupg wget software-properties-common
5-
RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null
6-
RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ jammy main'
3+
FROM $ARCH/ubuntu:24.04
4+
RUN apt update
5+
RUN apt upgrade -y
6+
RUN apt install -y gnupg wget software-properties-common apt-utils
7+
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
78
RUN apt install -y \
89
gcc-11 \
910
g++-11 \
1011
gcc-12 \
1112
g++-12 \
1213
gcc-13 \
1314
g++-13 \
15+
gcc-14 \
16+
g++-14 \
1417
clang-15 \
1518
clang-16 \
1619
clang-17 \
20+
clang-18 \
1721
git \
1822
vim \
1923
zstd \

.docker/build-linux.sh

+5-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ esac
3131

3232
case "-$BUILD_TYPE-" in
3333
*-gcc-*)
34-
export CC=gcc-13 CXX=g++-13
34+
export CC=gcc-14 CXX=g++-14
3535
export COMPILER=gcc
3636
;;
3737
*-oldgcc-*)
3838
export CC=gcc-11 CXX=g++-11
3939
;;
4040
*-clang-*)
41-
export CC=clang-17 CXX=clang++-17
41+
export CC=clang-18 CXX=clang++-18
4242
export COMPILER=clang
4343
;;
4444
*-oldclang-*)
@@ -90,6 +90,7 @@ if [[ "-$BUILD_TYPE-" == *-noperfmon-* ]]; then
9090
fi
9191

9292
if [[ "-$BUILD_TYPE-" == *-static-* ]]; then
93+
export LDFLAGS="-L/opt/static-libs/$COMPILER/lib"
9394
CMAKE_ARGS="${CMAKE_ARGS} -DSTATIC_BUILD_DO_NOT_USE=1"
9495
CMAKE_ARGS="${CMAKE_ARGS} -DSTATIC_BUILD_EXTRA_PREFIX=/opt/static-libs/$COMPILER"
9596
else
@@ -114,9 +115,9 @@ if [[ "-$BUILD_TYPE-" == *-coverage-* ]]; then
114115
unset LLVM_PROFILE_FILE
115116
rm -rf /tmp-runner/coverage
116117
mkdir -p /tmp-runner/coverage
117-
llvm-profdata-17 merge -sparse profile/* -o dwarfs.profdata
118+
llvm-profdata-18 merge -sparse profile/* -o dwarfs.profdata
118119
for binary in mkdwarfs dwarfs dwarfsck dwarfsextract *_test ricepp/ricepp_test; do
119-
llvm-cov-17 show -instr-profile=dwarfs.profdata $binary >/tmp-runner/coverage/$(basename $binary).txt
120+
llvm-cov-18 show -instr-profile=dwarfs.profdata $binary >/tmp-runner/coverage/$(basename $binary).txt
120121
done
121122
fi
122123

.docker/install-static-libs.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cd pkgs
88

99
FILE_VERSION=5.45
1010
FILE_SHA512=12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a
11+
BZIP2_VERSION=1.0.8
1112
LIBARCHIVE_VERSION=3.7.2
1213
FLAC_VERSION=1.4.3
1314
LIBUNWIND_VERSION=1.7.2
@@ -27,15 +28,16 @@ while true; do
2728
fi
2829
done
2930

31+
wget https://sourceware.org/pub/bzip2/bzip2-${BZIP2_VERSION}.tar.gz
3032
wget https://github.com/libarchive/libarchive/releases/download/v${LIBARCHIVE_VERSION}/libarchive-${LIBARCHIVE_VERSION}.tar.xz
3133
wget https://github.com/xiph/flac/releases/download/${FLAC_VERSION}/flac-${FLAC_VERSION}.tar.xz
3234
wget https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz
3335
# wget https://github.com/google/benchmark/archive/refs/tags/v${BENCHMARK_VERSION}.tar.gz
3436

3537
for COMPILER in clang gcc; do
3638
if [[ "$COMPILER" == "clang" ]]; then
37-
export CC=clang-17
38-
export CXX=clang++-17
39+
export CC=clang-18
40+
export CXX=clang++-18
3941
elif [[ "$COMPILER" == "gcc" ]]; then
4042
export CC=gcc-13
4143
export CXX=g++-13
@@ -50,6 +52,12 @@ for COMPILER in clang gcc; do
5052

5153
INSTALL_DIR=/opt/static-libs/$COMPILER
5254

55+
tar xf ../bzip2-${BZIP2_VERSION}.tar.gz
56+
cd bzip2-${BZIP2_VERSION}
57+
make -j$(nproc)
58+
make PREFIX="$INSTALL_DIR" install
59+
60+
cd "$HOME/pkgs/$COMPILER"
5361
tar xf ../libarchive-${LIBARCHIVE_VERSION}.tar.xz
5462
cd libarchive-${LIBARCHIVE_VERSION}
5563
./configure --prefix="$INSTALL_DIR" --without-iconv --without-xml2 --without-expat

0 commit comments

Comments
 (0)