From c8a3c2dd11b2a130840c4bbf40f33c22b20cb09f Mon Sep 17 00:00:00 2001 From: Pulumi Bot <30351955+pulumi-bot@users.noreply.github.com> Date: Tue, 25 Jun 2024 17:28:06 -0700 Subject: [PATCH] Update GitHub Actions workflows. (#441) [internal] Update GitHub Actions workflow files --- Makefile | 2 +- scripts/upstream.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fb789a5..a16a683 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ build_python: upstream rm -rf ./bin/ ../python.bin/ && cp -R . ../python.bin && mv ../python.bin ./bin && \ rm ./bin/go.mod && \ python3 -m venv venv && \ - ./venv/bin/python -m pip install build && \ + ./venv/bin/python -m pip install build==1.2.1 && \ cd ./bin && \ ../venv/bin/python -m build . diff --git a/scripts/upstream.sh b/scripts/upstream.sh index d35932e..23ba946 100755 --- a/scripts/upstream.sh +++ b/scripts/upstream.sh @@ -138,7 +138,7 @@ apply() { # apply the patch using a 3-way merge strategy. This mirrors the default behavior of 'git merge' cd upstream for patch in ../patches/*.patch; do - if ! git apply --3way "$patch"; then + if ! git apply --3way "$patch" --allow-empty; then cat <