From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Fri, 21 Oct 2022 19:40:37 +0000 (+0200)
Subject: ci: install dependencies from setup-ubuntu.sh
X-Git-Tag: v2.39-rc1~467^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46f06b194d500565a2629bd001487b054333fece;p=thirdparty%2Futil-linux.git

ci: install dependencies from setup-ubuntu.sh
---

diff --git a/.github/workflows/cibuild-setup-ubuntu.sh b/.github/workflows/cibuild-setup-ubuntu.sh
index 07b5282bae..c9e1d624fc 100755
--- a/.github/workflows/cibuild-setup-ubuntu.sh
+++ b/.github/workflows/cibuild-setup-ubuntu.sh
@@ -19,6 +19,11 @@ PACKAGES=(
 	asciidoctor
 	meson
 	lcov
+	gpg-agent
+	git
+	squashfs-tools
+	iproute2
+	dmsetup
 )
 
 PACKAGES_OPTIONAL=(
@@ -31,6 +36,9 @@ if [[ "$QEMU_USER" != "1" ]]; then
 	PACKAGES+=(linux-modules-extra-$(uname -r))
 fi
 
+apt-get -y update --fix-missing
+apt install -y lsb-release software-properties-common
+
 COMPILER="${COMPILER:?}"
 RELEASE="$(lsb_release -cs)"
 
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index a6131b01a8..6812f69eef 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -113,13 +113,9 @@ jobs:
             export SANITIZE=no
             export QEMU_USER=1
 
-            apt-get update
-            apt-get install -y --no-install-recommends lsb-release software-properties-common gpg-agent git squashfs-tools iproute2 dmsetup
-
-            git config --global --add safe.directory "$PWD"
-
             # name: Ubuntu setup
             .github/workflows/cibuild-setup-ubuntu.sh
+            git config --global --add safe.directory "$PWD"
             # Configure & Make
             .github/workflows/cibuild.sh CONFIGURE MAKE
             # Check