Skip to content

Commit 4e4d553

Browse files
committed
Update build.yml
1 parent 061da3f commit 4e4d553

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-24.04
2525

2626
container:
27-
image: debian:stable
27+
image: debian:stable-20260713
2828
env:
2929
DEBIAN_FRONTEND: noninteractive
3030
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
@@ -33,6 +33,9 @@ jobs:
3333
- name: Install CA certificates
3434
run: apt update && apt install -y ca-certificates
3535

36+
- name: Divert files conflicting during the APT transition
37+
run: dpkg-divert --package util-linux --no-rename --add /usr/bin/logger
38+
3639
- name: Update APT sources and upgrade
3740
run: |
3841
echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/10no-check-valid-until
@@ -44,7 +47,7 @@ jobs:
4447
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
4548
Architectures: amd64
4649
EOF
47-
apt update && apt full-upgrade -y
50+
apt update && apt -o Dpkg::Options::=--force-overwrite full-upgrade -y
4851
4952
- name: Setup amd64 environment
5053
run: apt install -y build-essential curl devscripts equivs git gnupg lintian ruby-full sudo
@@ -70,7 +73,7 @@ jobs:
7073
runs-on: ubuntu-24.04-arm
7174

7275
container:
73-
image: arm64v8/debian:stable
76+
image: arm64v8/debian:stable-20260713
7477
env:
7578
DEBIAN_FRONTEND: noninteractive
7679
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
@@ -79,6 +82,9 @@ jobs:
7982
- name: Install CA certificates
8083
run: apt update && apt install -y ca-certificates
8184

85+
- name: Divert files conflicting during the APT transition
86+
run: dpkg-divert --package util-linux --no-rename --add /usr/bin/logger
87+
8288
- name: Update APT sources and upgrade
8389
run: |
8490
echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/10no-check-valid-until
@@ -90,7 +96,7 @@ jobs:
9096
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
9197
Architectures: arm64
9298
EOF
93-
apt update && apt full-upgrade -y
99+
apt update && apt -o Dpkg::Options::=--force-overwrite full-upgrade -y
94100
95101
- name: Setup arm64 environment
96102
run: apt install -y build-essential curl devscripts equivs git gnupg lintian ruby-full sudo

0 commit comments

Comments
 (0)