♻️ Reuse justfile recipes in E2E workflow to remove duplication

- Split justfile into composable recipes (up, wait-services, migrate, e2e-test, e2e)
- Workflow now invokes 'just e2e' and 'just down' instead of inlining bash
- Keeps local and CI E2E flows consistent

Author: turtton

.github/workflows/e2e.yml

@@ -17,52 +17,23 @@ jobs:
 
       - name: Set up Rust toolchain
         uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable
 
       - name: Cache Rust build artifacts
         uses: Swatinem/rust-cache@v2
 
-      - name: Create master-key-password file
-        run: |
-          echo -n "ci-test-master-key-password" > master-key-password
-          chmod 600 master-key-password
-
-      - name: Start services via docker compose
-        run: docker compose up -d
+      - name: Install just
+        uses: extractions/setup-just@v2
 
-      - name: Wait for postgres
-        run: |
-          n=0
-          until docker compose exec -T postgres pg_isready -U postgres > /dev/null 2>&1; do
-            n=$((n+1))
-            if [ $n -ge 30 ]; then echo "ERROR: postgres not ready"; exit 1; fi
-            echo "Waiting for postgres... ($n)"
-            sleep 2
-          done
+      - name: Install cargo-binstall
+        uses: cargo-bins/cargo-binstall@main
 
-      - name: Wait for redis
-        run: |
-          n=0
-          until docker compose exec -T redis redis-cli ping 2>/dev/null | grep -q PONG; do
-            n=$((n+1))
-            if [ $n -ge 30 ]; then echo "ERROR: redis not ready"; exit 1; fi
-            echo "Waiting for redis... ($n)"
-            sleep 2
-          done
+      - name: Install sqlx-cli
+        run: cargo binstall sqlx-cli --no-confirm
 
-      - name: Wait for Ory services (Kratos, Hydra, Keto)
+      - name: Create master-key-password file
         run: |
-          for port in 4433 4444 4445 4466 4467; do
-            n=0
-            until curl -sf http://localhost:$port/health/alive > /dev/null 2>&1; do
-              n=$((n+1))
-              if [ $n -ge 30 ]; then echo "ERROR: port $port not ready"; exit 1; fi
-              echo "Waiting for port $port... ($n)"
-              sleep 2
-            done
-            echo "Port $port is ready"
-          done
+          echo -n "ci-test-master-key-password" > master-key-password
+          chmod 600 master-key-password
 
       - name: Create .env file
         run: |
@@ -79,27 +50,13 @@ jobs:
             echo "CORS_ALLOWED_ORIGINS=*"
           } > .env
 
-      - name: Install cargo-binstall
-        uses: cargo-bins/cargo-binstall@main
-
-      - name: Install sqlx-cli
-        run: cargo binstall sqlx-cli --no-confirm
-
-      - name: Run database migrations
-        run: sqlx migrate run
-        env:
-          DATABASE_URL: postgres://postgres:develop@localhost:5432/postgres
-
-      - name: Pre-build server binary
-        run: cargo build -p server
-
       - name: Run E2E tests
-        run: cargo test -p server --test e2e_basic_flow -- --ignored --test-threads=1 --nocapture
+        run: just e2e
 
       - name: Collect docker logs on failure
         if: failure()
         run: docker compose logs
 
       - name: Stop services
         if: always()
-        run: docker compose down -v
+        run: just down

justfile

@@ -1,6 +1,13 @@
-# Run E2E tests (requires docker compose services running)
-e2e:
+# Start docker compose services
+up:
     docker compose up -d
+
+# Stop all services
+down:
+    docker compose down -v
+
+# Wait for all services to become healthy
+wait-services:
     @echo "Waiting for services to be healthy..."
     @n=0; until docker compose exec -T postgres pg_isready -U postgres > /dev/null 2>&1; do \
         n=$((n+1)); if [ $n -ge 30 ]; then echo "ERROR: postgres not ready after 60s"; exit 1; fi; \
@@ -16,11 +23,25 @@ e2e:
             echo "Waiting for port $port..."; sleep 2; \
         done; \
     done
+    @echo "All services healthy."
+
+# Verify master-key-password file exists
+check-master-key:
     @test -f master-key-password || (echo "ERROR: master-key-password file not found" && exit 1)
-    @echo "All services healthy. Running E2E tests..."
-    cargo test -p server --test e2e_basic_flow -- --ignored --test-threads=1
-    @echo "E2E tests complete."
 
-# Stop all services
-e2e-down:
-    docker compose down -v
+# Run database migrations (requires sqlx-cli)
+migrate:
+    sqlx migrate run
+
+# Run E2E tests only (services and prerequisites must be ready)
+e2e-test:
+    cargo build -p server
+    cargo test -p server --test e2e_basic_flow -- --ignored --test-threads=1 --nocapture
+
+# Full local E2E flow: start services, wait, verify, run tests
+e2e: up wait-services check-master-key
+    @just migrate
+    @just e2e-test
+
+# Alias for stopping services
+e2e-down: down