Skip to content

Commit

Permalink
Update GitHub Actions workflows. (#305)
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 484812bf955375e4ab4081f41e07301756dbaf2b.
  • Loading branch information
pulumi-bot authored Oct 25, 2023
1 parent f9ea328 commit db8b205
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -168,15 +168,15 @@ end_rebase() {
rebase_merge_dir=$(cd upstream && git rev-parse --git-path rebase-merge)
rebase_apply_dir=$(cd upstream && git rev-parse --git-path rebase-apply)

if [[ -d "${rebase_merge_dir}" || -d "${rebase_apply_dir}" ]]; then
if [ -d "${rebase_merge_dir}" ] || [ -d "${rebase_apply_dir}" ]; then
echo "rebase still in progress in './upstream'. Please resolve the rebase in"
echo "'./upstream' and then run 'make \"$1\"' again."
exit 1
fi

rm patches/*.patch
cd upstream
git format-patch local -o ../patches --no-prefix --zero-commit --no-signature --no-stat
git format-patch local -o ../patches --zero-commit --no-signature --no-stat
cd ..
rm rebase-in-progress
apply "$1"
Expand Down

0 comments on commit db8b205

Please sign in to comment.