Skip to content

Commit c53884a

Browse files
[CI] Use hwloc from apt in QEMU build
The version we install is probably too old for multi-numa tests.
1 parent 0a85167 commit c53884a

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

.github/workflows/qemu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,4 @@ jobs:
123123
fi
124124
125125
scp -P 2222 ${{github.workspace}}/scripts/qemu/run-build.sh [email protected]:/home/cxltest
126-
scp -P 2222 ${{github.workspace}}/.github/scripts/install_hwloc.sh [email protected]:/home/cxltest
127126
ssh [email protected] -p 2222 -t "bash /home/cxltest/run-build.sh https://github.com/$CI_REPO ${{env.CI_BRANCH}}"

scripts/qemu/run-build.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ repo=$1
1010
branch=$2
1111

1212
echo password | sudo -Sk apt update
13-
echo password | sudo -Sk apt install -y git cmake gcc g++ numactl libnuma-dev libjemalloc-dev libtbb-dev
14-
15-
# install packages required for building hwloc from source
16-
echo password | sudo -Sk apt install -y autoconf libtool
17-
source install_hwloc.sh
13+
echo password | sudo -Sk apt install -y git cmake gcc g++ numactl libnuma-dev libhwloc-dev libjemalloc-dev libtbb-dev pkg-config
1814

1915
numactl -H
2016

0 commit comments

Comments
 (0)