From 8bad7afe2f2fd069347e7bb53861817f6b4a89ad Mon Sep 17 00:00:00 2001
From: Pulumi Bot <bot@pulumi.com>
Date: Fri, 12 Jul 2024 06:57:48 +0000
Subject: [PATCH] [internal] Update GitHub Actions workflow files

---
 Makefile            |   8 --
 scripts/upstream.sh | 198 --------------------------------------------
 2 files changed, 206 deletions(-)
 delete mode 100755 scripts/upstream.sh

diff --git a/Makefile b/Makefile
index 8ebd0a98..d232b30f 100644
--- a/Makefile
+++ b/Makefile
@@ -166,14 +166,6 @@ ifneq ("$(wildcard upstream)","")
 	./upstream.sh init
 endif
 
-upstream.finalize:
-	echo "Deprecated: Use `./upstream.sh format_patches` instead"
-	scripts/upstream_old.sh "$@" end_rebase
-
-upstream.rebase:
-	echo "Deprecated: Use `./upstream.sh checkout` and `./upstream.sh rebase` instead"
-	scripts/upstream_old.sh "$@" start_rebase
-
 bin/pulumi-java-gen: .pulumi-java-gen.version
 	pulumictl download-binary -n pulumi-language-java -v v$(shell cat .pulumi-java-gen.version) -r pulumi/pulumi-java
 
diff --git a/scripts/upstream.sh b/scripts/upstream.sh
deleted file mode 100755
index 23ba9467..00000000
--- a/scripts/upstream.sh
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/usr/bin/env bash
-# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
-
-set -e
-
-# "$1" is the current make command being run.
-# It is used to make the error message more actionable.
-err_rebase_in_progress() {
-  cat <<EOF
-A rebase is already in progress. To finish the current rebase,
-complete the 'git rebase' in './upstream' and then run:
-
-    make upstream.finalize
-
-If you want to abandon the rebase currently in progress and
-execute this target anyway, run:
-
-    rm rebase-in-progress && make "$1"
-
-EOF
-  exit 1
-}
-
-assert_upstream() {
-  if [ ! -d upstream ]; then
-    echo "No upstream directory detected. \"$1\" does not make sense in this context."
-    exit 1
-  fi
-}
-
-rebase_in_progress() {
-  [ -f rebase-in-progress ]
-  return $?
-}
-
-# "$1" is the current make command being run.
-# It is used to make the error message more actionable.
-assert_no_rebase_in_progress() {
-  if rebase_in_progress; then
-     err_rebase_in_progress "$1"
-  fi
-}
-
-message_rebase_clean() {
-  cat <<EOF
-
-The full patch set has been cleanly applied to the './upstream' repository.
-To "edit" the patch set, commit changes directly to './upstream'. When
-you are done making changes, run:
-
-    make upstream.finalize
-
-to finish the rebase and commit those changes into the patch set.
-
-EOF
-}
-
-message_rebase_dirty() {
-cat <<EOF
-
-The patch set did not apply cleanly. You need to manually resolve
-rebase conflicts directly in './upstream'. When you have completed
-the rebase, run
-
-    make upstream.finalize
-
-This will finalize the changes you made back into the patch set.
-
-EOF
-}
-
-# "$1" is the current make command being run.
-# It is used to make the error message more actionable.
-start_rebase() {
-  assert_upstream "$1"
-  assert_no_rebase_in_progress "$1"
-
-  git submodule update --force --init
-  rm -rf .git/modules/upstream/rebase-merge
-  cd upstream && git fetch
-
-  git branch -f local
-  if [ -n "$FROM" ]; then
-      echo "Rebasing from $FROM to $(git rev-parse HEAD)"
-      git checkout -B pulumi-patch "$FROM"
-  else
-      echo "Rebasing in place at $(git rev-parse HEAD)"
-      git checkout -B pulumi-patch
-  fi
-  git branch --set-upstream-to=local pulumi-patch
-
-  for patch in ../patches/*.patch; do
-    echo "Applying $patch"
-    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
-  done
-
-  touch ../rebase-in-progress
-
-  if git rebase local; then
-    message_rebase_clean
-  else
-    message_rebase_dirty
-  fi
-}
-
-# "$1" is the current make command being run.
-# It is used to make the error message more actionable.
-assert_rebase_in_progress() {
-  if ! rebase_in_progress; then
-    cat <<EOF
-Didn't detect an upstream rebase in progress.
-To start an upstream rebase, run
-
-    [FROM=vX.Y.Z] make upstream.rebase
-
-If you are absolutly sure you are already in a rebase, run
-
-    touch rebase-in-progress && make "$1"
-
-EOF
-    exit 1
-  fi
-}
-
-# "$1" is the current make command being run.
-# It is used to make the error message more actionable.
-apply() {
-  assert_upstream
-  assert_no_rebase_in_progress "$1"
-
-  git submodule update --force --init
-  # Iterating over the patches folder in sorted order,
-  # 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" --allow-empty; then
-      cat <<EOF
-
-make "$1"' failed to apply ${patch}. This is because there is a conflict between
-the checked out version of upstream and the patch set. To resolve this conflict
-run:
-
-    FROM=\$LAST_KNOWN_GOOD_COMMIT make upstream.rebase
-
-This will walk you through resolving the conflict and producing a patch set that
-cleanly applies to the current upstream.
-
-EOF
-      exit 1
-    fi
-  done
-}
-
-# "$1" is the current make command being run.
-# It is used to make the error message more actionable.
-end_rebase() {
-  assert_rebase_in_progress "$1"
-  # Use git to resolve the possible location of files indicating a rebase might be in progress.
-  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
-    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 --zero-commit --no-signature --no-stat --no-numbered
-  cd ..
-  rm rebase-in-progress
-  apply "$1"
-}
-
-case $2 in
-  apply)
-    apply "$1"
-    ;;
-  start_rebase)
-    start_rebase "$1"
-    ;;
-  end_rebase)
-    end_rebase "$1"
-    ;;
-  *)
-    cat <<EOF
-Unknown argument $2.
-
-Expected convention ./scripts/upstream.sh $@ [apply|start_rebase|end_rebase]
-EOF
-    ;;
-esac