[internal] Update GitHub Actions workflow files (#224)

pulumi · Jun 26, 2024 · 10d5754 · 10d5754
1 parent c972595
commit 10d5754
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 <<EOF
 
 make "$1"' failed to apply ${patch}. This is because there is a conflict between