fix: gh actions oom try without overmind

Author: samrose

nix/tools/dbmate-tool.sh.in

@@ -15,52 +15,41 @@ CURRENT_SYSTEM="@CURRENT_SYSTEM@"
 ANSIBLE_VARS="@ANSIBLE_VARS@"
 PGBOUNCER_AUTH_SCHEMA_SQL=@PGBOUNCER_AUTH_SCHEMA_SQL@
 STAT_EXTENSION_SQL=@STAT_EXTENSION_SQL@
+
+# Start PostgreSQL using nix
+start_postgres() {
+ echo "Starting PostgreSQL..."
+ nix run "$FLAKE_URL#start-server" -- "$PSQL_VERSION" --skip-migrations --daemonize &
+ echo "PostgreSQL started."
+}
+
 # Cleanup function
 cleanup() {
  echo "Cleaning up..."
 
- # First, gracefully stop Overmind if it's running
- if [ -S "./.overmind.sock" ]; then
- echo "Stopping Overmind gracefully..."
- overmind quit || true
- sleep 5 # Give Overmind time to shut down
- fi
-
  # Stop PostgreSQL processes gracefully
  if pgrep -f "postgres" >/dev/null; then
  echo "Stopping PostgreSQL gracefully..."
- pkill -TERM postgres || true
+ pkill -f "postgres" || true # Adjust this if you have a specific way to stop the service
  sleep 5 # Wait for PostgreSQL to shut down
  fi
 
- # Clean up any remaining tmux sessions
- if tmux ls 2>/dev/null | grep 'overmind'; then
- echo "Cleaning up tmux sessions..."
- tmux ls 2>/dev/null | grep 'overmind' | cut -d: -f1 | xargs -I{} tmux kill-session -t {} || true
- sleep 2
- fi
-
- # Final cleanup: Force kill if necessary (as a last resort)
- if ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep >/dev/null; then
- echo "Force killing remaining processes..."
- pkill -9 -f "(postgres|overmind|tmux.*postgresql)" || true
- sleep 2
- fi
-
- # Remove socket and Procfile
- rm -f .overmind.sock Procfile
-
  # Verify cleanup
- if ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep >/dev/null; then
- echo "Warning: Some processes could not be cleaned up:"
- ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep
+ if pgrep -f "postgres" >/dev/null; then
+ echo "Warning: Some PostgreSQL processes could not be cleaned up:"
+ pgrep -f "postgres"
  return 1
  else
  echo "Cleanup completed successfully"
  fi
 }
+
 # Set up trap for cleanup on script exit
 trap cleanup EXIT INT TERM
+
+# Start PostgreSQL
+start_postgres
+
 # Function to display help
 print_help() {
  echo "Usage: nix run .#dbmate-tool -- [options]"
@@ -81,7 +70,6 @@ print_help() {
  echo " nix run .#dbmate-tool -- --version 16 --port 5433 --flake-url github:supabase/postgres/<commithash>"
 }
 
-
 # Parse arguments
 while [[ "$#" -gt 0 ]]; do
  case "$1" in
@@ -138,7 +126,7 @@ wait_for_postgres() {
  local max_attempts=30 # Increased significantly
  local attempt=1
 
- # Give overmind a moment to actually start the process
+ # Give PostgreSQL a moment to actually start the process
  sleep 2
 
  while [ $attempt -le $max_attempts ]; do
@@ -155,7 +143,6 @@ wait_for_postgres() {
  done
 
  echo "PostgreSQL failed to start after $max_attempts attempts"
- overmind echo postgres
  return 1
 }
 
@@ -188,26 +175,7 @@ trim_schema() {
  ;;
  esac
 }
-overmind_start() {
- cat > Procfile << EOF
-postgres_${PSQL_VERSION}: exec nix run "$FLAKE_URL#start-server" -- "$PSQL_VERSION" --skip-migrations
-EOF
- overmind start -D
- echo "Waiting for overmind socket..."
- max_wait=5
- count=0
- while [ $count -lt $max_wait ]; do
- if [ -S "./.overmind.sock" ]; then
- # Found the socket, give it a moment to be ready
- sleep 5
- echo "Socket file found and ready"
- break
- fi
- echo "Waiting for socket file (attempt $count/$max_wait)"
- sleep 1
- count=$((count + 1))
- done
-}
+
 perform_dump() {
  local max_attempts=3
  local attempt=1
@@ -227,21 +195,18 @@ perform_dump() {
  echo "All dump attempts failed"
  return 1
 }
+
 migrate_version() {
  echo "PSQL_VERSION: $PSQL_VERSION"
- overmind kill || true
- rm -f .overmind.sock Procfile || true
+ pkill -f "postgres" || true # Ensure PostgreSQL is stopped before starting
  PSQLBIN=$(nix build --no-link "$FLAKE_URL#psql_$PSQL_VERSION/bin" --json | jq -r '.[].outputs.out + "/bin"')
  echo "Using PostgreSQL version $PSQL_VERSION from $PSQLBIN"
 
- # Start overmind
- overmind_start
- echo "Waiting for overmind socket..."
-
-
+ # Start PostgreSQL
+ start_postgres
  echo "Waiting for PostgreSQL to be ready..."
 
- #Wait for PostgreSQL to be ready to accept connections
+ # Wait for PostgreSQL to be ready to accept connections
  if ! wait_for_postgres; then
  echo "Failed to connect to PostgreSQL server"
  exit 1
@@ -268,11 +233,11 @@ EOSQL
  "${PSQLBIN}/psql" -v ON_ERROR_STOP=1 --no-password --no-psqlrc -U postgres -p "$PORTNO" -h localhost -d postgres -f "$PGBOUNCER_AUTH_SCHEMA_SQL"
  "${PSQLBIN}/psql" -v ON_ERROR_STOP=1 --no-password --no-psqlrc -U postgres -p "$PORTNO" -h localhost -d postgres -f "$STAT_EXTENSION_SQL"
 
- #set db url to run dbmate
+ # Set db url to run dbmate
  export DATABASE_URL="postgres://$PGSQL_USER:$PGPASSWORD@localhost:$PORTNO/postgres?sslmode=disable"
- #export path so dbmate can find correct psql and pg_dump
+ # Export path so dbmate can find correct psql and pg_dump
  export PATH="$PSQLBIN:$PATH"
- # run init scripts
+ # Run init scripts
  if ! dbmate --migrations-dir "$MIGRATIONS_DIR/init-scripts" up; then
  echo "Error: Initial migration failed"
  exit 1