Skip to content

Commit e0ffe6a

Browse files
committed
Update to Debian Trixie
This allows us to finally drop all "unstable" hacks (as `riscv64` is an officially supported architecture in Trixie+).
1 parent e73a539 commit e0ffe6a

File tree

8 files changed

+22
-69
lines changed

8 files changed

+22
-69
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
run: |
3636
strategy="$(GENERATE_STACKBREW_LIBRARY='.github/workflows/fake-gsl.sh' "$BASHBREW_SCRIPTS/github-actions/generate.sh")"
3737
strategy="$(.github/workflows/munge-build.sh -c <<<"$strategy")"
38-
strategy="$(.github/workflows/munge-unstable.sh -c <<<"$strategy")"
3938
4039
EOF="EOF-$RANDOM-$RANDOM-$RANDOM"
4140
echo "strategy<<$EOF" >> "$GITHUB_OUTPUT"
@@ -65,10 +64,4 @@ jobs:
6564
- name: '"docker images"'
6665
run: ${{ matrix.runs.images }}
6766
- name: Git Diff # see "munge-build.sh"
68-
run: |
69-
if git diff --exit-code */*/Dockerfile.builder; then # see "hack-unstable.sh" (and "munge-unstable.sh")
70-
git diff --exit-code
71-
else
72-
# for unstable builds, let's leave this in but purely informational (instead of causing CI to fail)
73-
git diff
74-
fi
67+
run: git diff --exit-code

.github/workflows/munge-unstable.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

Dockerfile-builder.template

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,25 @@ RUN set -eux; \
1717
tar \
1818
;
1919
{{ ) else ( -}}
20-
FROM debian:bookworm-slim
20+
FROM debian:trixie-slim
2121

2222
RUN set -eux; \
23-
apt-get update; \
24-
apt-get install -y \
23+
apt-get install --update -y \
2524
bzip2 \
2625
curl \
2726
gcc \
2827
gnupg \
2928
make \
3029
patch \
3130
; \
32-
rm -rf /var/lib/apt/lists/*
31+
apt-get dist-clean
3332
{{ ) end -}}
3433
{{ if env.variant == "uclibc" then ( -}}
3534

3635
# grab/use buildroot for its uClibc toolchain
3736

3837
RUN set -eux; \
39-
apt-get update; \
40-
apt-get install -y \
38+
apt-get install --update -y \
4139
bc \
4240
cpio \
4341
dpkg-dev \
@@ -49,7 +47,7 @@ RUN set -eux; \
4947
unzip \
5048
wget \
5149
; \
52-
rm -rf /var/lib/apt/lists/*
50+
apt-get dist-clean
5351

5452
# pub dsa1024 2009-01-15 [SC]
5553
# AB07 D806 D2CE 741F B886 EE50 B025 BA8B 59C3 6319

hack-unstable.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

latest-1/glibc/Dockerfile.builder

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest-1/uclibc/Dockerfile.builder

Lines changed: 5 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/glibc/Dockerfile.builder

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

latest/uclibc/Dockerfile.builder

Lines changed: 5 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)