From 1420399f6620b417d9da4b801d3c049cf66e58f0 Mon Sep 17 00:00:00 2001 From: Vincent Fu Date: Sat, 18 Dec 2021 19:46:51 -0500 Subject: [PATCH] ci: workaround for problem with i686 builds GitHub Actions currently has package dependency problems with some i386 packages. The work-around suggested in https://github.com/actions/virtual-environments/issues/4620 appears to resolve the issue for our builds. Signed-off-by: Vincent Fu --- ci/actions-install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/actions-install.sh b/ci/actions-install.sh index 7408ccb4..b3486a47 100755 --- a/ci/actions-install.sh +++ b/ci/actions-install.sh @@ -31,14 +31,17 @@ DPKGCFG case "${CI_TARGET_ARCH}" in "i686") sudo dpkg --add-architecture i386 + opts="--allow-downgrades" pkgs=("${pkgs[@]/%/:i386}") pkgs+=( gcc-multilib pkg-config:i386 zlib1g-dev:i386 + libpcre2-8-0=10.34-7 ) ;; "x86_64") + opts="" pkgs+=( libglusterfs-dev libgoogle-perftools-dev @@ -62,7 +65,7 @@ DPKGCFG echo "Updating APT..." sudo apt-get -qq update echo "Installing packages..." - sudo apt-get install -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}" + sudo apt-get install "$opts" -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}" } install_linux() { -- 2.25.1