gpsps - push, pr, deploy staging

Author: ndbroadbent

bashrc/default.sh

@@ -31,13 +31,13 @@ if [ -x /usr/bin/dircolors ]; then
 fi
 
 # Default editors
-export EDITOR="cursor --wait"
-export VISUAL="cursor --wait"
-export GUI_EDITOR="cursor"
-export REACT_EDITOR="cursor"
-export BUNDLER_EDITOR="cursor"
+export EDITOR="cursor editor --wait"
+export VISUAL="cursor editor --wait"
+export GUI_EDITOR="cursor editor"
+export REACT_EDITOR="cursor editor"
+export BUNDLER_EDITOR="cursor editor"
 export GIT_EDITOR="vim"
-export KUBE_EDITOR="cursor --wait"
+export KUBE_EDITOR="cursor editor --wait"
 
 # GPG
 export GPG_TTY=$(tty)

bashrc/github.sh

@@ -1,19 +1,33 @@
 #!/bin/bash
 # See: https://docs.gitlab.com/ee/user/project/push_options.html
 
-# Push and create GitHub PR, then wait for CI build to finish
-gpsp() (
-  set -euo pipefail
-  git push
+# Push, open a GitHub PR, and surface the latest pipeline status in Chrome.
+_git_push_create_pr_and_open_pipeline() {
+  git push "$@"
   gh pr create --fill || true
   gh pr view --web
 
-  local CURRENT_GIT_BRANCH CURRENT_GIT_COMMIT
-  CURRENT_GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
-  CURRENT_GIT_COMMIT="$(git rev-parse HEAD)"
-  PIPELINE_URL="$(./scripts/circleci_pipeline_status -f "%u" -b "$CURRENT_GIT_BRANCH" -c "$CURRENT_GIT_COMMIT")"
-  local CHROME_BIN="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-  "$CHROME_BIN" "${PIPELINE_URL}" 2>/dev/null
+  local current_git_branch current_git_commit pipeline_url
+  current_git_branch="$(git rev-parse --abbrev-ref HEAD)"
+  current_git_commit="$(git rev-parse HEAD)"
+  pipeline_url="$(./scripts/circleci_pipeline_status -f "%u" -b "$current_git_branch" -c "$current_git_commit")"
+  local chrome_bin="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+  "$chrome_bin" "${pipeline_url}" 2>/dev/null
+}
 
+# Push and create GitHub PR, then wait for CI build to finish
+gpsp() (
+  set -euo pipefail
+  _git_push_create_pr_and_open_pipeline "$@"
   [ -f scripts/wait_for_ci_build ] && scripts/wait_for_ci_build
 )
+
+# Push, open PR, approve staging deploy, and wait for CI build to finish
+gpsps() (
+  set -euo pipefail
+  _git_push_create_pr_and_open_pipeline "$@"
+  ./scripts/ci/approve staging
+  [ -f scripts/wait_for_ci_build ] && scripts/wait_for_ci_build
+)
+
+alias gpssp='gpsps'

bin/git-clean-branches

@@ -147,6 +147,9 @@ main() {
         if [ -n "$worktree_path" ]; then
           echo "  Removing worktree at: $worktree_path"
 
+          # Remove submodules from worktree first to avoid Git errors
+          remove_worktree_submodules "$worktree_path"
+
           # Use remove_worktree script if available, otherwise use git worktree remove
           if has_remove_worktree_script "$main_repo"; then
             (cd "$main_repo" && ./scripts/remove_worktree "$branch")