diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 04abc22..0857b41 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -26,17 +26,11 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Cargo build all - run: cargo build --all --verbose - - - name: Cargo test all - run: cargo test --all --lib --verbose 2>&1 | tail -150 || true - - - name: Cargo clippy - run: cargo clippy --all --all-targets -- -D warnings 2>&1 | tail -50 || true - - - name: Clean build artifacts before Docker - run: cargo clean + - name: Cargo build, test, clippy (single compile pass) + run: | + cargo build --all --verbose + cargo test --all --lib --verbose 2>&1 | tail -150 || true + cargo clippy --all --all-targets -- -D warnings 2>&1 | tail -50 || true - name: Get short SHA id: sha @@ -44,6 +38,10 @@ jobs: - name: Registry login run: | + if [ -z "${REGISTRY_USER}" ] || [ -z "${REGISTRY_TOKEN}" ]; then + echo "ERROR: Missing REGISTRY_USER or REGISTRY_TOKEN secrets" + exit 1 + fi echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \ --username "${REGISTRY_USER}" --password-stdin env: diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 52db832..57cc53a 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -15,29 +15,48 @@ jobs: name: Tag & Push Latest runs-on: rust steps: - - name: Install Docker - run: apt-get update && apt-get install -y docker.io + - name: Install Docker and curl + run: apt-get update && apt-get install -y docker.io curl - - name: Checkout code - uses: actions/checkout@v4 - - - name: Get short SHA + - name: Get short SHA via Gitea API id: sha - run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT + run: | + # Fetch latest commit SHA for main branch from Gitea API + COMMIT_SHA=$(curl -s -H "Authorization: token ${REGISTRY_TOKEN}" \ + "https://forgejo.riotpiao.com/api/v1/repos/riotpiao-poimen/poimen-memory/commits?sha=main&limit=1" | \ + grep -o '"sha":"[^"]*' | head -1 | cut -d'"' -f4) + + if [ -z "$COMMIT_SHA" ]; then + echo "ERROR: Failed to fetch commit SHA from Gitea API" + exit 1 + fi + + SHORT_SHA=$(echo "$COMMIT_SHA" | cut -c1-7) + echo "short_sha=$SHORT_SHA" >> $GITHUB_OUTPUT + echo "Full SHA: $COMMIT_SHA, Short: $SHORT_SHA" + env: + REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }} - name: Registry login run: | + if [ -z "${REGISTRY_USER}" ] || [ -z "${REGISTRY_TOKEN}" ]; then + echo "ERROR: Missing REGISTRY_USER or REGISTRY_TOKEN secrets" + exit 1 + fi echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" \ --username "${REGISTRY_USER}" --password-stdin env: REGISTRY_USER: ${{ secrets.FORGEJO_REGISTRY_USER }} REGISTRY_TOKEN: ${{ secrets.FORGEJO_REGISTRY_TOKEN }} - - name: Pull SHA image and tag as latest + - name: Verify SHA image exists, tag as latest run: | - docker pull "${IMAGE}:${{ steps.sha.outputs.short_sha }}" && \ - docker tag "${IMAGE}:${{ steps.sha.outputs.short_sha }}" "${IMAGE}:latest" && \ - docker push "${IMAGE}:latest" && \ + if ! docker pull "${IMAGE}:${{ steps.sha.outputs.short_sha }}"; then + echo "ERROR: Image ${IMAGE}:${{ steps.sha.outputs.short_sha }} not found. Check build.yaml passed." + exit 1 + fi + docker tag "${IMAGE}:${{ steps.sha.outputs.short_sha }}" "${IMAGE}:latest" + docker push "${IMAGE}:latest" echo "Tagged and pushed: ${IMAGE}:latest (from ${{ steps.sha.outputs.short_sha }})" - name: Prune images diff --git a/.gitea/workflows/migrate.yaml b/.gitea/workflows/migrate.yaml index 84c25e0..e3028fc 100644 --- a/.gitea/workflows/migrate.yaml +++ b/.gitea/workflows/migrate.yaml @@ -31,7 +31,7 @@ jobs: echo "Changed migrations: $CHANGED" echo "CHANGED_MIGRATIONS=$CHANGED" >> $GITHUB_ENV - - name: Run migrations + - name: Run changed migrations and verify schema if: env.CHANGED_MIGRATIONS != '' run: | export PGPASSWORD="${DB_PASSWORD}" @@ -55,18 +55,27 @@ jobs: DB_USER: ${{ secrets.DB_USER }} DB_PASSWORD: ${{ secrets.DB_PASSWORD }} - - name: Run all migrations (manual trigger) + - name: Run all migrations and verify schema (manual trigger) if: github.event_name == 'workflow_dispatch' run: | export PGPASSWORD="${DB_PASSWORD}" echo "=== Running all migrations in order ===" + FAILED=0 for f in $(ls crates/mem-store/migrations/*.sql | sort); do echo "--- Applying: $f ---" - psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -f "$f" 2>&1 || true - echo "--- Done: $f ---" + if ! psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -f "$f" 2>&1; then + echo "ERROR: Migration $f failed!" + FAILED=1 + else + echo "--- OK: $f ---" + fi done + if [ $FAILED -eq 1 ]; then + exit 1 + fi + echo "=== Final schema ===" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -c "\dt memory*" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -c "\d memory_entity"