File tree Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Expand file tree Collapse file tree 2 files changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ export LC_ALL=C.UTF-8
99export HOST=i686-pc-linux-gnu
1010export CONTAINER_NAME=ci_i686_centos
1111export DOCKER_NAME_TAG=quay.io/centos/centos:stream8
12- export DOCKER_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-zmq which patch lbzip2 xz procps-ng dash rsync coreutils bison"
12+ export DOCKER_PACKAGES=" gcc-c++ glibc-devel.x86_64 libstdc++-devel.x86_64 glibc-devel.i686 libstdc++-devel.i686 ccache libtool make git python3 python3-pip which patch lbzip2 xz procps-ng dash rsync coreutils bison"
13+ export PIP_PACKAGES=" pyzmq"
1314export GOAL=" install"
1415export BITCOIN_CONFIG=" --enable-zmq --with-gui=qt5 --enable-reduce-exports"
1516export CONFIG_SHELL=" /bin/dash"
Original file line number Diff line number Diff line change @@ -10,12 +10,6 @@ if [[ $QEMU_USER_CMD == qemu-s390* ]]; then
1010 export LC_ALL=C
1111fi
1212
13- if [ " $CI_OS_NAME " == " macos" ]; then
14- sudo -H pip3 install --upgrade pip
15- # shellcheck disable=SC2086
16- IN_GETOPT_BIN=" /usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
17- fi
18-
1913# Create folders that are mounted into the docker
2014mkdir -p " ${CCACHE_DIR} "
2115mkdir -p " ${PREVIOUS_RELEASES_DIR} "
@@ -78,9 +72,16 @@ elif [ "$CI_USE_APT_INSTALL" != "no" ]; then
7872 fi
7973 ${CI_RETRY_EXE} CI_EXEC apt-get update
8074 ${CI_RETRY_EXE} CI_EXEC apt-get install --no-install-recommends --no-upgrade -y " $PACKAGES " " $DOCKER_PACKAGES "
81- if [ -n " $PIP_PACKAGES " ]; then
75+ fi
76+
77+ if [ -n " $PIP_PACKAGES " ]; then
78+ if [ " $CI_OS_NAME " == " macos" ]; then
79+ sudo -H pip3 install --upgrade pip
80+ # shellcheck disable=SC2086
81+ IN_GETOPT_BIN=" /usr/local/opt/gnu-getopt/bin/getopt" ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
82+ else
8283 # shellcheck disable=SC2086
83- ${CI_RETRY_EXE} pip3 install --user $PIP_PACKAGES
84+ ${CI_RETRY_EXE} CI_EXEC pip3 install --user $PIP_PACKAGES
8485 fi
8586fi
8687
You can’t perform that action at this time.
0 commit comments