Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/build-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:

jobs:
setup-matrix:
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
Expand Down Expand Up @@ -47,6 +47,7 @@ jobs:
runs-on: [self-hosted, Linux, X64]
strategy:
fail-fast: false
max-parallel: 4
matrix: ${{ fromJson(needs.setup-matrix.outputs.matrix) }}
defaults:
run:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/codex-parity-advisory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
codex-parity-advisory:
name: codex-parity-advisory
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/deploy-gateway-agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ env:
jobs:
validate:
name: Validate Configuration
# PMOVES.AI: Use self-hosted runners for production CI
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
permissions:
contents: read
steps:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/hardening-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# ============================================================================
validate-hardening:
name: Validate Hardening Patterns
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest

steps:
- name: Harden Runner
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
# ============================================================================
validate-dockerfiles:
name: Validate Dockerfiles
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
strategy:
fail-fast: false
# Limit fan-out to reduce self-hosted queue contention.
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
# ============================================================================
docker-bench:
name: Docker Bench Security
runs-on: [self-hosted, Linux, X64]
runs-on: [self-hosted, Linux, X64, vps]

steps:
- name: Harden Runner
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
# ============================================================================
validate-compose:
name: Validate Compose Files
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest

steps:
- name: Harden Runner
Expand Down Expand Up @@ -277,7 +277,7 @@ jobs:
# ============================================================================
summary:
name: Validation Summary
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
needs: [validate-hardening, validate-dockerfiles, validate-compose]
if: always()

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ concurrency:

jobs:
tests:
# PMOVES.AI: Use self-hosted runners for production CI
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
permissions:
contents: read
actions: read
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/self-hosted-builds-hardened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ jobs:
runs-on: [self-hosted, Linux, X64]
strategy:
fail-fast: false
max-parallel: 3
matrix:
service:
- name: pmoves-yt
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/sql-policy-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ permissions:

jobs:
lint:
# PMOVES.AI: Use self-hosted runners for production CI
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
permissions:
contents: read
steps:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/webhook-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@ on:
permissions:
contents: read

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
smoke:
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@v2
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/yt-dlp-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ permissions:

jobs:
bump-yt-dlp:
# PMOVES.AI: Use self-hosted runners for production CI
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -38,6 +37,12 @@ jobs:
fi
echo "version=$latest" >> $GITHUB_OUTPUT

- name: Set up QEMU
uses: docker/setup-qemu-action@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v4

- name: Build pmoves-yt with bumped yt-dlp
uses: docker/build-push-action@v6
with:
Expand Down
21 changes: 20 additions & 1 deletion pmoves/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ SUPABASE_DB_HELPER ?= scripts/supabase/find_db_container.sh
up-supabase: ## Start Supabase using selected runtime (SUPABASE_RUNTIME=cli|kong|compose)
@$(MAKE) --no-print-directory supa-start

.PHONY: supa-init supa-start supa-stop supa-stop-all supa-status supa-runtime-env supa-logs supa-health supa-restart supa-migrate supa-use-local supa-use-remote supa-env-doctor supa-env-doctor-strict supa-runtime-guard supa-runtime-reconcile
.PHONY: supa-init supa-start supa-stop supa-stop-all supa-status supa-runtime-env supa-logs supa-health supa-restart supa-migrate supa-use-local supa-use-remote supa-env-doctor supa-env-doctor-strict supa-runtime-guard supa-runtime-reconcile supa-collation-refresh supa-collation-check
supa-init: check-tools ## Initialize supabase/config.toml (one-time) and enforce PMOVES CLI defaults
@if [ ! -f "$(SUPABASE_CONFIG)" ]; then \
echo "🗂️ Initializing Supabase project in . ..."; \
Expand Down Expand Up @@ -313,6 +313,7 @@ supa-start: check-tools ensure-env-shared ## Start Supabase stack for selected r
$(DC) up -d supabase-postgrest supabase-gotrue supabase-kong supabase-realtime supabase-storage supabase-studio; \
fi
@$(MAKE) --no-print-directory supa-status
@$(MAKE) --no-print-directory supa-collation-refresh 2>/dev/null || true

supa-stop: ## Stop Supabase stack for selected runtime
@echo "🗄️ Stopping Supabase stack (SUPABASE_RUNTIME=$(SUPABASE_RUNTIME))..."
Expand Down Expand Up @@ -461,6 +462,24 @@ supa-health: ## Health checks for selected runtime + active DB container readine
echo " ❌ Studio ($$studio_url) -> $$studio_code"; \
fi

supa-collation-refresh: ## Refresh collation version for all Supabase databases (RG-3)
@echo "Refreshing collation versions..."
@db=$$(bash "$(SUPABASE_DB_HELPER)" running); \
if [ -z "$$db" ]; then echo "Supabase DB container not found"; exit 1; fi; \
for dbname in postgres _supabase; do \
echo " -> ALTER DATABASE $$dbname REFRESH COLLATION VERSION"; \
docker exec -i "$$db" psql -U postgres -d "$$dbname" \
-c "ALTER DATABASE $$dbname REFRESH COLLATION VERSION;" 2>&1 || true; \
done
@echo "Collation refresh complete"

supa-collation-check: ## Check for collation version mismatches
@db=$$(bash "$(SUPABASE_DB_HELPER)" running); \
if [ -z "$$db" ]; then echo "Supabase DB container not found"; exit 1; fi; \
docker exec -i "$$db" psql -U postgres -tAc \
"SELECT datname || ': ' || COALESCE(datcollversion, 'NULL') FROM pg_database WHERE datname NOT IN ('template0','template1') ORDER BY datname;"
@echo "Collation check complete"

supa-use-local: ## Write .env.local from local Supabase template and merge keys from current supa-status
@$(PYTHON) scripts/supabase/apply_env_profile.py --profile local --runtime "$(SUPABASE_RUNTIME)" --target .env.local --status-file .supabase.status.env
@echo "✅ .env.local updated for SUPABASE_RUNTIME=$(SUPABASE_RUNTIME)"
Expand Down
Loading
Loading