ci: install dependencies from setup-ubuntu.sh

diff --git a/.github/workflows/cibuild-setup-ubuntu.sh b/.github/workflows/cibuild-setup-ubuntu.sh
index 07b5282baec053d6c7cac7a1103e0749b78d6b32..c9e1d624fcd9aba74de7688fd3a7c7e297839a50 100755 (executable)
--- 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 a6131b01a83706e0323ac5c72e9cd8b93b1d77a1..6812f69eefcdb34271b4dc6f4fb72de9ac241a4e 100644 (file)
--- 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