Skip to content

Commit

Permalink
Update GitHub Actions workflows. (#399)
Browse files Browse the repository at this point in the history
This PR was automatically generated by the
update-workflows-ecosystem-providers workflow in the pulumi/ci-mgmt
repo, from commit a3df048b5c2feadf736eb06060e46b980a181861.
  • Loading branch information
pulumi-bot authored Jun 26, 2024
1 parent c0786ee commit 9b24f55
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .

Expand Down
2 changes: 1 addition & 1 deletion scripts/upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9b24f55

Please sign in to comment.