Skip to content

Commit cdf819f

Browse files
committed
Add trixie builds
1 parent 18c96cf commit cdf819f

File tree

2 files changed

+17
-22
lines changed

2 files changed

+17
-22
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
variant: [bookworm, bullseye]
12+
variant: [trixie, bookworm, bullseye]
1313
target: [arm64, x86_64]
1414
include:
1515
- target: arm64
@@ -37,9 +37,9 @@ jobs:
3737
needs: [docker-build]
3838
strategy:
3939
matrix:
40-
variant: [bookworm, bullseye]
40+
variant: [trixie, bookworm, bullseye]
4141
include:
42-
- variant: bookworm
42+
- variant: trixie
4343
is_latest: true
4444
env:
4545
VERSION: ${{ matrix.variant }}

Dockerfile

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
ARG DOCKER_ARCH=
2-
ARG DEBIAN_VERSION=
2+
ARG DEBIAN_VERSION
33
FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION}
44

5+
ARG DEBIAN_VERSION
56
RUN export DEBIAN_FRONTEND=noninteractive && \
67
apt-get update -y && \
78
apt-get install -y git-core gnupg flex bison gperf build-essential \
@@ -11,20 +12,21 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
1112
dosfstools gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
1213
gcc-arm-linux-gnueabi g++-arm-linux-gnueabi ccache \
1314
sudo cpio nano vim kmod kpartx wget libarchive-tools qemu-user-static \
14-
xz-utils ruby-dev debootstrap multistrap libssl-dev parted \
15+
xz-utils ruby-dev debootstrap libssl-dev parted \
1516
live-build jq locales \
1617
gawk swig libusb-1.0-0-dev \
1718
pkg-config autoconf golang-go \
18-
python3-distutils python3-dev python3-pip python3-pyelftools \
19-
eatmydata debhelper libelf-dev libdw-dev && \
20-
( \
21-
( \
22-
. /etc/os-release && \
23-
echo deb http://deb.debian.org/debian $(echo "$VERSION_CODENAME")-backports main >> /etc/apt/sources.list.d/backports.list && \
24-
apt-get update -y && \
25-
apt-get install -y -t $(echo "$VERSION_CODENAME")-backports golang-go \
26-
) || true \
27-
) && \
19+
python3-dev python3-pip python3-pyelftools \
20+
eatmydata debhelper libelf-dev libdw-dev \
21+
uuid-dev libgnutls28-dev fdisk gdisk cmake \
22+
libftdi1-dev libpopt-dev libncurses-dev zstd pv \
23+
moreutils && \
24+
( [ "$DEBIAN_VERSION" = "trixie" ] || apt-get install -y python3-distutils multistrap ) && \
25+
( [ "$DEBIAN_VERSION" = "trixie" ] || ( \
26+
echo deb http://deb.debian.org/debian $(echo "$DEBIAN_VERSION")-backports main >> /etc/apt/sources.list.d/backports.list && \
27+
apt-get update -y && \
28+
( apt-get install -y -t $(echo "$DEBIAN_VERSION")-backports golang-go || true ) \
29+
) ) && \
2830
apt-get autoclean
2931

3032
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -43,13 +45,6 @@ RUN git config --system user.email "you@rock64" && \
4345

4446
RUN gem install fpm
4547

46-
RUN ( \
47-
. /etc/os-release && \
48-
echo deb http://deb.debian.org/debian $(echo "$VERSION_CODENAME")-backports main >> /etc/apt/sources.list.d/backports.list && \
49-
apt-get update -y && \
50-
apt-get install -y -t $(echo "$VERSION_CODENAME")-backports golang-go \
51-
) || true
52-
5348
RUN go install github.com/github-release/[email protected] && \
5449
which github-release
5550

0 commit comments

Comments
 (0)