Skip to content

Commit ae7c14f

Browse files
committed
pefile: always install via pip
To ensure using the same, pinned, version in all build scenarios.
1 parent 22c136f commit ae7c14f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

_build-runner.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if [ ! -f .cw-initialized ]; then
2525
*_NT*)
2626
for env in 'x86_64' 'clang-aarch64'; do
2727
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
28-
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
28+
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pip,rsync,gettext,osslsigncode} \
2929
zip
3030
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \
3131
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
@@ -53,7 +53,7 @@ if [ ! -f .cw-initialized ]; then
5353
fi
5454
# shellcheck disable=SC2086
5555
apt-get --option Dpkg::Use-Pty=0 --yes install --no-install-suggests --no-install-recommends \
56-
curl git gpg rsync python3-pefile make cmake ninja-build \
56+
curl git gpg rsync python3-pip python3-venv make cmake ninja-build \
5757
zip xz-utils time jq secure-delete ${extra}
5858
elif [ "${_DISTRO}" = 'alpine' ]; then
5959
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && extra+=' go'

_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ export _REVSUFFIX="${_REV}"; [ -z "${_REVSUFFIX}" ] || _REVSUFFIX="_${_REVSUFFIX
426426
. ./_dl.sh
427427

428428
# Install required component
429-
if [ "${_OS}" = 'win' ] && [ "${_HOST}" = 'mac' ]; then
429+
if [ "${_OS}" = 'win' ]; then
430430
if [ ! -d .venv ]; then
431431
python3 -m venv .venv
432432
PIP_PROGRESS_BAR=off .venv/bin/python3 -m pip --disable-pip-version-check --no-cache-dir --require-virtualenv install -r requirements.txt

_ci-linux-debian.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fi
9292
${sudo} apt-get --option Dpkg::Use-Pty=0 --yes update
9393
# shellcheck disable=SC2086
9494
${sudo} apt-get --option Dpkg::Use-Pty=0 --yes install --no-install-suggests --no-install-recommends \
95-
curl ca-certificates git gpg gpg-agent patch ssh rsync python3-pefile make cmake ninja-build \
95+
curl ca-certificates git gpg gpg-agent patch ssh rsync python3-pip python3-venv make cmake ninja-build \
9696
libssl-dev zlib1g-dev \
9797
zip xz-utils time jq secure-delete cosign ${extra}
9898

_ci-win-msys2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ for env in 'x86_64' 'clang-aarch64'; do
99
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
1010
pacman --noconfirm --ask 20 --noprogressbar --sync --refresh --sysupgrade --sysupgrade
1111
pacman --noconfirm --ask 20 --noprogressbar --sync --needed \
12-
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pefile,rsync,gettext,osslsigncode} \
12+
mingw-w64-"${env}"-{clang,cmake,ninja,jq,python-pip,rsync,gettext,osslsigncode} \
1313
zip
1414

1515
[[ "${CW_CONFIG:-}" = *'boringssl'* ]] && \

0 commit comments

Comments
 (0)