From 46f06b194d500565a2629bd001487b054333fece Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Fri, 21 Oct 2022 21:40:37 +0200 Subject: [PATCH] ci: install dependencies from setup-ubuntu.sh --- .github/workflows/cibuild-setup-ubuntu.sh | 8 ++++++++ .github/workflows/cibuild.yml | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) 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 -- 2.47.2