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

pulumi · Jun 26, 2023 · f3345f3 · f3345f3
1 parent 6582eb7
commit f3345f3
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
@@ -91,14 +91,12 @@ start_rebase() {
 
  for patch in ../patches/*.patch; do
  echo "Applying $patch"
- if ! git apply --3way "$patch"; then
+ if ! git am --3way "$patch"; then
  echo
  echo "Failed to apply patch. Please run 'make upstream.rebase FROM=$TAG' where '$TAG' allows the patch set to apply cleanly"
  echo
  exit 1
  fi
- patch=${patch#../patches/*-}
- git commit -am "${patch%.patch}"
  done
 
  touch ../rebase-in-progress