Adds Ubuntu 24.04/noble.

Some DEB822 files are replacing the old sources.list files, which required fixes for cross-compiling environments. The Azure package cache only contains amd64/i386 binaries, but the GitHub images don't restrict them.
main
tommie 2024-05-17 11:39:31 +02:00 committed by GitHub
parent 963995cc7b
commit 6b9130dcf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 1 deletions

View File

@ -59,7 +59,7 @@ jobs:
run: |
declare -a new_release_exists
for arch in amd64 armhf arm64; do
for ver_codename in ubuntu-22.04/jammy ubuntu-20.04/focal; do
for ver_codename in ubuntu-24.04/noble ubuntu-22.04/jammy ubuntu-20.04/focal; do
ver=${ver_codename%/*}
codename=${ver_codename##*/}
# Note the leading v to match the Git tag.
@ -95,6 +95,9 @@ jobs:
arch: [amd64]
os: ${{ fromJson(needs.check-upstream.outputs.new_release_exists) }}
include:
- os: ubuntu-24.04
codename: noble
image: ubuntu:24.04
- os: ubuntu-22.04
codename: jammy
image: ubuntu:22.04
@ -195,6 +198,11 @@ jobs:
- name: Install Distro Dependencies
run: |
sudo sed -i -e 's;^\(deb\(-src\)\?\)\(\s\+\)\(\(https\?://azure\.archive\.ubuntu\.com\|https\?://archive\.ubuntu\.com\|https\?://security\.ubuntu\.com\)/\|mirror+file:/etc/apt/apt-mirrors\.txt\);\1\3[arch=amd64,i386]\3\4;' /etc/apt/sources.list /etc/apt/sources.list.d/*.list
for f in /etc/apt/sources.list.d/*.sources; do
# -i inplace doesn't work with END.
sudo awk 'BEGIN { FS = ": +"; } END { if (found) print "Architectures: amd64 i386" archs; } found && !$0 { print "Architectures: amd64 i386" archs; } !$0 { found = 0; archs = ""; } $1 == "URIs" && $2 ~ /azure\.archive\.ubuntu\.com/ { found = 1; } $1 == "Architectures" { archs = " " $2; next; } { print; }' "$f" | sudo tee "$f.tmp" >/dev/null
sudo mv "$f.tmp" "$f"
done
sudo dpkg --add-architecture "${{ matrix.arch }}"
# apt-get install goes into an infinite loop (use -o Debug::pkgAcquire=true to see it) if we use apt-mirrors.txt, like GitHub does for the host architecture.
# So we just limit the mirrors file and use our trusty sources.list overrides.

View File

@ -1,3 +1,12 @@
Origin: Unofficial Innernet Debian repository
Label: innernet-debian
Description: APT repository for https://github.com/tonarino/innernet/.
Codename: noble
Architectures: amd64 armhf arm64
Components: contrib
DebOverride: deboverride
SignWith: 65828D743CEE8B69
Origin: Unofficial Innernet Debian repository
Label: innernet-debian
Description: APT repository for https://github.com/tonarino/innernet/.