From 2b0887d27866c4568a6f378f051ad912a120a4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20M=C3=A4rdian?= Date: Wed, 5 Feb 2025 13:37:59 +0100 Subject: [PATCH] CI: downgrade systemd dependency (wait-online DNS) --- .github/workflows/autopkgtest.yml | 1 + .github/workflows/network-manager.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/autopkgtest.yml b/.github/workflows/autopkgtest.yml index 9723c2975..ee7e0ef9e 100644 --- a/.github/workflows/autopkgtest.yml +++ b/.github/workflows/autopkgtest.yml @@ -48,6 +48,7 @@ jobs: cp -r netplan.io-*/debian . rm -r debian/patches/ # clear any distro patches sed -i 's|iproute2,|iproute2, ethtool,|' debian/control # add ethtool as a dependency of netplan.io temporarily + sed -i 's|systemd (>= 257.2-3ubuntu1~),|systemd (>= 248~),|g' debian/control # see https://github.com/canonical/netplan/pull/535 TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) # find latest (stable) tag REV=$(git rev-parse --short HEAD) # get current git revision VER="$TAG+git~$REV" diff --git a/.github/workflows/network-manager.yml b/.github/workflows/network-manager.yml index 20a1e599a..a7c23a42f 100644 --- a/.github/workflows/network-manager.yml +++ b/.github/workflows/network-manager.yml @@ -41,6 +41,7 @@ jobs: pull-lp-source netplan.io cp -r netplan.io-*/debian . rm -r debian/patches/ # clear any distro patches + sed -i 's|systemd (>= 257.2-3ubuntu1~),|systemd (>= 248~),|g' debian/control # see https://github.com/canonical/netplan/pull/535 echo "3.0 (native)" > debian/source/format # force native build TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) # find latest (stable) tag REV=$(git rev-parse --short HEAD) # get current git revision