From 20677292b6a8623548af40cddc3ef47079a53402 Mon Sep 17 00:00:00 2001
From: Justin Wood <jwood@me.com>
Date: Tue, 26 Oct 2021 19:09:01 -0700
Subject: [PATCH] Replacing script

---
 .../pull_upstream_and_regenerate_zap.sh       | 28 ++++++
 scripts/helpers/rebase_and_regenerate_zap.sh  | 99 -------------------
 2 files changed, 28 insertions(+), 99 deletions(-)
 create mode 100755 scripts/helpers/pull_upstream_and_regenerate_zap.sh
 delete mode 100755 scripts/helpers/rebase_and_regenerate_zap.sh

diff --git a/scripts/helpers/pull_upstream_and_regenerate_zap.sh b/scripts/helpers/pull_upstream_and_regenerate_zap.sh
new file mode 100755
index 00000000000000..4ac091a88742aa
--- /dev/null
+++ b/scripts/helpers/pull_upstream_and_regenerate_zap.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -x
+
+git pull upstream master
+git submodule update --init --recursive third_party/zap/
+
+git status
+
+cd third_party/zap/repo/
+npm ci
+npm run version-stamp
+npm rebuild canvas --update-binary
+npm run build-spa
+
+cd ../../../
+
+scripts/tools/zap_regen_all.py
+
+git status
+
+git add zzz_generated/*
+git add src/darwin/Framework/*
+git add src/controller/python/chip/clusters/*
+git add src/controller/java/zap-generated/*
+
+git status
+
+git commit -m "Regenerating ZAP"
diff --git a/scripts/helpers/rebase_and_regenerate_zap.sh b/scripts/helpers/rebase_and_regenerate_zap.sh
deleted file mode 100755
index 7ba2f829366285..00000000000000
--- a/scripts/helpers/rebase_and_regenerate_zap.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-# Credit to https://github.com/cirrus-actions/rebase for the base functionality here
-
-set -e
-
-PR_NUMBER=$(jq -r ".pull_request.number" "$GITHUB_EVENT_PATH")
-if [[ "$PR_NUMBER" == "null" ]]; then
-	PR_NUMBER=$(jq -r ".issue.number" "$GITHUB_EVENT_PATH")
-fi
-if [[ "$PR_NUMBER" == "null" ]]; then
-	echo "Failed to determine PR Number."
-	exit 1
-fi
-echo "Collecting information about PR #$PR_NUMBER of $GITHUB_REPOSITORY..."
-
-if [[ -z "$GITHUB_TOKEN" ]]; then
-	echo "Set the GITHUB_TOKEN env variable."
-	exit 1
-fi
-
-URI=https://api.github.com
-API_HEADER="Accept: application/vnd.github.v3+json"
-AUTH_HEADER="Authorization: token $GITHUB_TOKEN"
-
-pr_resp=$(curl -X GET -s -H "${AUTH_HEADER}" -H "${API_HEADER}" \
-          "${URI}/repos/$GITHUB_REPOSITORY/pulls/$PR_NUMBER")
-
-BASE_REPO=$(echo "$pr_resp" | jq -r .base.repo.full_name)
-BASE_BRANCH=$(echo "$pr_resp" | jq -r .base.ref)
-
-USER_LOGIN=$(jq -r ".comment.user.login" "$GITHUB_EVENT_PATH")
-
-user_resp=$(curl -X GET -s -H "${AUTH_HEADER}" -H "${API_HEADER}" \
-            "${URI}/users/${USER_LOGIN}")
-
-USER_NAME=$(echo "$user_resp" | jq -r ".name")
-if [[ "$USER_NAME" == "null" ]]; then
-	USER_NAME=$USER_LOGIN
-fi
-USER_NAME="${USER_NAME} (Rebase PR Action)"
-
-USER_EMAIL=$(echo "$user_resp" | jq -r ".email")
-if [[ "$USER_EMAIL" == "null" ]]; then
-	USER_EMAIL="$USER_LOGIN@users.noreply.github.com"
-fi
-
-if [[ -z "$BASE_BRANCH" ]]; then
-	echo "Cannot get base branch information for PR #$PR_NUMBER!"
-	exit 1
-fi
-
-HEAD_REPO=$(echo "$pr_resp" | jq -r .head.repo.full_name)
-HEAD_BRANCH=$(echo "$pr_resp" | jq -r .head.ref)
-
-echo "Base branch for PR #$PR_NUMBER is $BASE_BRANCH"
-
-USER_TOKEN=${USER_LOGIN//-/_}_TOKEN
-UNTRIMMED_COMMITTER_TOKEN=${!USER_TOKEN:-$GITHUB_TOKEN}
-COMMITTER_TOKEN="$(echo -e "${UNTRIMMED_COMMITTER_TOKEN}" | tr -d '[:space:]')"
-
-git remote set-url origin https://x-access-token:$COMMITTER_TOKEN@github.com/$GITHUB_REPOSITORY.git
-git config --global user.email "$USER_EMAIL"
-git config --global user.name "$USER_NAME"
-
-git remote add fork https://x-access-token:$COMMITTER_TOKEN@github.com/$HEAD_REPO.git
-
-set -o xtrace
-
-# make sure branches are up-to-date
-git fetch origin $BASE_BRANCH
-git fetch fork $HEAD_BRANCH
-
-# do the rebase
-git checkout -b $HEAD_BRANCH fork/$HEAD_BRANCH
-git rebase origin/$BASE_BRANCH
-
-git submodule update --init --recursive third_party/zap/
-
-cd third_party/zap/repo/
-npm ci
-npm run version-stamp
-npm rebuild canvas --update-binary
-npm run build-spa
-
-cd ../../../
-
-scripts/tools/zap_regen_all.py
-
-git status
-
-git add zzz_generated/*
-git add src/darwin/Framework/*
-git add src/controller/python/chip/clusters/*
-git add src/controller/java/zap-generated/*
-
-git commit -m "Regenerating ZAP"
-
-# push back
-git push --force-with-lease fork fork/"$HEAD_BRANCH:$HEAD_BRANCH"