blob: 163ebf3b334c64c05d6fb4bf531d02efe32943b0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From aa1075ba2ff300e4017bd7813423f63b1fbc325f Mon Sep 17 00:00:00 2001
From: Vincent Fu <vincent.fu@samsung.com>
Date: Mon, 29 Aug 2022 15:15:56 -0400
Subject: [PATCH] test: get 32-bit Ubuntu 22.04 build working
Ubuntu 22.04 no longer has i386 builds for the packages libibverbs and
librdmacm. So stop trying to install those packages for the 32-bit
build.
Signed-off-by: Vincent Fu <vincent.fu@samsung.com>
---
.github/workflows/ci.yml | 2 +-
ci/actions-install.sh | 11 ++++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85104e5a..bdc4db85 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
- build: macos
os: macos-11
- build: linux-i686-gcc
- os: ubuntu-20.04
+ os: ubuntu-22.04
arch: i686
- build: android
os: ubuntu-22.04
diff --git a/ci/actions-install.sh b/ci/actions-install.sh
index 7017de2a..c209a089 100755
--- a/ci/actions-install.sh
+++ b/ci/actions-install.sh
@@ -23,26 +23,21 @@ DPKGCFG
libcunit1-dev
libcurl4-openssl-dev
libfl-dev
- libibverbs-dev
libnuma-dev
- librdmacm-dev
libnfs-dev
valgrind
)
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
@@ -53,6 +48,8 @@ DPKGCFG
librbd-dev
libtcmalloc-minimal4
nvidia-cuda-dev
+ libibverbs-dev
+ librdmacm-dev
)
echo "Removing libunwind-14-dev because of conflicts with libunwind-dev"
sudo apt remove -y libunwind-14-dev
@@ -68,8 +65,8 @@ DPKGCFG
echo "Updating APT..."
sudo apt-get -qq update
- echo "Installing packages..."
- sudo apt-get install "$opts" -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}"
+ echo "Installing packages... ${pkgs[@]}"
+ sudo apt-get install -o APT::Immediate-Configure=false --no-install-recommends -qq -y "${pkgs[@]}"
}
install_linux() {
|
