Skip to content

Commit a403590

Browse files
evelikovlucasdemarchi
authored andcommitted
ci: swap bullseye for bookworm
The former has been EOL for a bit now and somewhat recently has been (re)moved from the repos -> our CI was failing. Swap for bookworm, which gives us the "try a slightly older distro" coverage, while still being green in CI. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Link: #395 Signed-off-by: Lucas De Marchi <demarchi@kernel.org>
1 parent 695fd08 commit a403590

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

.github/actions/setup-os/setup-debian.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@
66

77
export DEBIAN_FRONTEND=noninteractive
88
export TZ=Etc/UTC
9-
10-
. /etc/os-release
11-
12-
backports_pkgs=()
13-
if [[ "$VERSION_CODENAME" == "bullseye" ]]; then
14-
echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list
15-
backports_pkgs=("meson" "ninja-build")
16-
fi
17-
189
apt-get update
1910
apt-get install --yes \
2011
bash \
@@ -31,7 +22,3 @@ apt-get install --yes \
3122
scdoc \
3223
zlib1g-dev \
3324
zstd
34-
35-
if (( ${#backports_pkgs[@]} )); then
36-
apt-get install --yes -t "${VERSION_CODENAME}"-backports "${backports_pkgs[@]}"
37-
fi

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
meson_setup: '-Db_sanitize=none'
3535
only_bits: '64'
3636
- container: 'archlinux:multilib-devel'
37-
- container: 'debian:bullseye-slim'
37+
- container: 'debian:bookworm-slim'
3838
meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled'
3939
only_compiler: 'gcc'
4040
- container: 'debian:unstable'

0 commit comments

Comments
 (0)