update rack-gateway aliases

Author: ndbroadbent

bashrc/development.sh

@@ -22,34 +22,23 @@ alias GFORCE='git add -A && git commit --amend -C HEAD && git push -f'
 # checks out the previous branch, and then rebases onto main.
 alias grbl='MAIN_BRANCH=$((! [ -f .git/config ] && echo "master") || (grep -q '"'"'branch "master"'"'"' .git/config && echo master || echo main)) && git checkout "$MAIN_BRANCH" && git pull && git checkout - && git rebase "$MAIN_BRANCH"'
 
-# Helper function for git push with CI approvals
+# Helper function for git push with rack-gateway deploy approval
 _git_push_and_approve() {
   local push_flags=""
-  local approvals=()
+  local racks="$1"
+  shift
 
   # Check for -f flag
   if [[ "$1" == "-f" ]]; then
     push_flags="-f"
     shift
   fi
 
-  # Collect remaining arguments as approvals
-  approvals=("$@")
-
-  # Execute git push and approvals
-  git push $push_flags && {
-    for approval in "${approvals[@]}"; do
-      ./scripts/ci/approve "$approval" || return 1
-    done
-  }
-
-  ./scripts/wait_for_ci_build
+  git push $push_flags && rack-gateway deploy-approval wait --racks "$racks" --approve
 }
 
-gpss() { _git_push_and_approve "$@" staging; }
-gpsbs() { _git_push_and_approve "$@" build staging; }
-gpsa() { _git_push_and_approve "$@" all; }
-gpsba() { _git_push_and_approve "$@" build all; }
+gpss() { _git_push_and_approve "staging" "$@"; }
+gpsp() { _git_push_and_approve "staging,eu,us" "$@"; }
 
 # Gitlab CI (DocSpring)
 # -------------------------------------------------

bashrc/github.sh

@@ -45,12 +45,11 @@ gpsw() (
   echo "No CI actions detected"
 )
 
-# Push, open PR, approve staging deploy, and wait for CI build to finish
+# Push, open PR, approve staging deploy via rack-gateway
 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
+  rack-gateway deploy-approval wait --rack staging --approve
 )
 
 alias gpssp='gpsps'

bashrc/path.sh

@@ -57,7 +57,7 @@ export PATH="${PATH}:/Users/ndbroadbent/code/depot_tools"
 # export PKG_CONFIG_PATH="/opt/homebrew/opt/postgresql@9.6/lib/pkgconfig"
 
 # Postgres.app
-export PATH="/Applications/Postgres.app/Contents/Versions/15/bin:${PATH}"
+export PATH="/Applications/Postgres.app/Contents/Versions/17/bin:${PATH}"
 
 # Homebrew library paths for compilation (fixes mysql2, nokogiri, etc.)
 export LDFLAGS="${LDFLAGS} -L/opt/homebrew/opt/zstd/lib"