Merge pull request 'ci(CAR-1373): apply dev's deploy-job restoration to uat (dev → uat promotion, 3-way resolved)' (#38 ) from car-1373-uat-merge-resolved into uat

ci(CAR-1373): apply dev's deploy-job restoration to uat (resolve 3-way)
The dev→uat 3-way merge of ci.yml conflicts on: - CalVer logic (dev is the multi-line readable form) - ref: main vs parameterized expression (dev wins, per CAR-1374) - PR body base/head: dev wins (per CAR-1371 + acceptance criteria) - CAR-1216 comment: dev added, uat didn't have it Resolution: take dev's version of ci.yml (the corrected form per CAR-1373). cc @cpfarhood
2026-06-12 02:09:22 +00:00 · 2026-06-10 22:47:36 +00:00 · 2026-06-05 05:12:38 +00:00 · 2026-06-05 00:53:13 +00:00 · 2026-06-05 00:52:22 +00:00 · 2026-06-05 00:51:07 +00:00
1 changed files with 148 additions and 28 deletions
@@ -37,17 +37,17 @@ jobs:
        run: |
          DATE_TAG=$(date -u +%Y.%m.%d)
          EXISTING=$(git tag -l "v${DATE_TAG}*" | sort -V | tail -1)
-          if [ -z "$EXISTING" ]; then VERSION="$DATE_TAG"
-          elif [ "$EXISTING" = "v${DATE_TAG}" ]; then VERSION="${DATE_TAG}.2"
-          else BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))"; fi
+          if [ -z "$EXISTING" ]; then
+            VERSION="$DATE_TAG"
+          elif [ "$EXISTING" = "v${DATE_TAG}" ]; then
+            VERSION="${DATE_TAG}.2"
+          else
+            BUILD_NUM=$(echo "$EXISTING" | sed "s/v${DATE_TAG}\.//"); VERSION="${DATE_TAG}.$((BUILD_NUM + 1))";
+          fi
          echo "version=$VERSION" >> "$GITHUB_OUTPUT"

      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
+        run: echo "${{ secrets.REGISTRY_TOKEN }}" | docker login ${{ env.REGISTRY }} -u "${{ github.actor }}" --password-stdin

      - name: Extract metadata
        id: meta
@@ -76,16 +76,27 @@ jobs:
  deploy-dev:
    runs-on: ubuntu-latest
    needs: [build-and-push]
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
+    if: always() && !cancelled() && github.event_name == 'push' && (github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/main')
    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout infra repo
+        uses: actions/checkout@v4
        with:
          repository: cartsnitch/infra
-          token: ${{ secrets.GITEA_TOKEN }}
-          ref: main
+          token: ${{ secrets.CI_GITEA_TOKEN }}
+          ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
          path: infra

-      - uses: imranismail/setup-kustomize@v2
+      - name: Install kustomize
+        # Install kustomize binary directly. Avoids imranismail/setup-kustomize@v2
+        # which calls the Gitea API to record "kubernetes-sigs" user metrics
+        # against a user that does not exist in this Gitea instance.
+        run: |
+          set -euo pipefail
+          version="5.4.3"
+          url="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${version}/kustomize_v${version}_linux_amd64.tar.gz"
+          curl -fsSL --retry 3 "$url" | tar -xz -C /tmp kustomize
+          sudo mv /tmp/kustomize /usr/local/bin/kustomize
+          kustomize version

      - name: Determine image tag
        id: tag
@@ -97,34 +108,96 @@ jobs:
          fi

      - name: Update auth image tag in dev overlay
+        if: needs.build-and-push.result == 'success'
        run: |
          cd infra/apps/overlays/dev
          kustomize edit set image ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:${{ steps.tag.outputs.tag }}

-      - name: Commit and push to infra
+      - name: Commit and push to infra (via PR)
+        if: needs.build-and-push.result == 'success'
+        env:
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
        run: |
+          set -euo pipefail
          cd infra
          git config user.name "cartsnitch-ci[bot]"
          git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
          git add apps/overlays/dev/kustomization.yaml
-          git diff --cached --quiet && echo "No changes" && exit 0
-          git commit -m "ci(dev): update auth image from cartsnitch/auth CI"
-          git pull --rebase origin main
-          git push origin main
+          git diff --cached --quiet && { echo "No image changes to deploy"; exit 0; }
+          BRANCH="ci/deploy-dev-${GITHUB_SHA}"
+          git checkout -b "$BRANCH"
+          git commit -m "ci(dev): update auth image (${GITHUB_SHA::12})"
+          git push origin "$BRANCH" 2>&1 | tee /tmp/push.log
+          if grep -q "You are not allowed to push code to protected branches" /tmp/push.log; then
+            echo "::notice::Refusing to push directly to protected branch — falling back to contents API"
+            exit 0
+          fi
+          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base dev --arg title ("ci(dev): update auth image (" + env.GITHUB_SHA[:12] + ")") --arg body "Bumps apps/overlays/dev/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
+            '{head: $head, base: $base, title: $title, body: $body}')
+          PR_JSON=$(curl -sS -X POST \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$PR_BODY" \
+            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
+          PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
+          if [ -z "$PR_NUM" ]; then
+            echo "::error::Failed to open infra PR: $PR_JSON"
+            exit 1
+          fi
+          echo "Opened cartsnitch/infra PR #${PR_NUM}"
+          REVIEW_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{"reviewers":["cs_savannah"]}' \
+            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/requested_reviewers")
+          if [ "${REVIEW_HTTP}" -lt 200 ] || [ "${REVIEW_HTTP}" -ge 300 ]; then
+            echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
+          fi
+          # CAR-1216: the in-job merge attempt is a best-effort fast-path only.
+          # `cartsnitch/infra` main requires a human approving review; the CI bot
+          # cannot self-approve. Treat any non-merged outcome (approvals pending,
+          # checks pending, any other Gitea message) as the GitOps approval gate
+          # — the PR is already opened and cs_savannah is requested as reviewer.
+          MERGE_RESP=$(curl -sS -X POST \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{"Do":"merge","delete_branch_after_merge":true}' \
+            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
+          MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
+          if [ "$MERGED" = "true" ]; then
+            echo "PR #${PR_NUM} merged into cartsnitch/infra dev"
+          elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
+            echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
+            exit 0
+          else
+            echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
+            exit 1
+          fi

  deploy-uat:
    runs-on: ubuntu-latest
    needs: [build-and-push]
-    if: github.event_name == 'push' && (github.ref == 'refs/heads/uat' || github.ref == 'refs/heads/main')
+    if: always() && !cancelled() && github.event_name == 'push' && (github.ref == 'refs/heads/uat' || github.ref == 'refs/heads/main')
    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout infra repo
+        uses: actions/checkout@v4
        with:
          repository: cartsnitch/infra
-          token: ${{ secrets.GITEA_TOKEN }}
-          ref: main
+          token: ${{ secrets.CI_GITEA_TOKEN }}
+          ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
          path: infra

-      - uses: imranismail/setup-kustomize@v2
+      - name: Install kustomize
+        # Install kustomize binary directly. Avoids imranismail/setup-kustomize@v2
+        # which calls the Gitea API to record "kubernetes-sigs" user metrics
+        # against a user that does not exist in this Gitea instance.
+        run: |
+          set -euo pipefail
+          version="5.4.3"
+          url="https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${version}/kustomize_v${version}_linux_amd64.tar.gz"
+          curl -fsSL --retry 3 "$url" | tar -xz -C /tmp kustomize
+          sudo mv /tmp/kustomize /usr/local/bin/kustomize
+          kustomize version

      - name: Determine image tag
        id: tag
@@ -136,17 +209,64 @@ jobs:
          fi

      - name: Update auth image tag in uat overlay
+        if: needs.build-and-push.result == 'success'
        run: |
          cd infra/apps/overlays/uat
          kustomize edit set image ghcr.io/cartsnitch/auth=git.farh.net/cartsnitch/auth:${{ steps.tag.outputs.tag }}

-      - name: Commit and push to infra
+      - name: Commit and push to infra (via PR)
+        if: needs.build-and-push.result == 'success'
+        env:
+          CI_GITEA_TOKEN: ${{ secrets.CI_GITEA_TOKEN }}
        run: |
+          set -euo pipefail
          cd infra
          git config user.name "cartsnitch-ci[bot]"
          git config user.email "cartsnitch-ci[bot]@users.noreply.github.com"
          git add apps/overlays/uat/kustomization.yaml
-          git diff --cached --quiet && echo "No changes" && exit 0
-          git commit -m "ci(uat): update auth image from cartsnitch/auth CI"
-          git pull --rebase origin main
-          git push origin main
+          git diff --cached --quiet && { echo "No image changes to deploy"; exit 0; }
+          BRANCH="ci/deploy-uat-${GITHUB_SHA}"
+          git checkout -b "$BRANCH"
+          git commit -m "ci(uat): update auth image (${GITHUB_SHA::12})"
+          git push origin "$BRANCH" 2>&1 | tee /tmp/push.log
+          if grep -q "You are not allowed to push code to protected branches" /tmp/push.log; then
+            echo "::notice::Refusing to push directly to protected branch — falling back to contents API"
+            exit 0
+          fi
+          PR_BODY=$(jq -n --arg head "cartsnitch:${BRANCH}" --arg base uat --arg title ("ci(uat): update auth image (" + env.GITHUB_SHA[:12] + ")") --arg body "Bumps apps/overlays/uat/kustomization.yaml auth newTag to \`${{ steps.tag.outputs.tag }}\` from cartsnitch/auth CI build $GITHUB_SHA." \
+            '{head: $head, base: $base, title: $title, body: $body}')
+          PR_JSON=$(curl -sS -X POST \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "$PR_BODY" \
+            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls")
+          PR_NUM=$(echo "$PR_JSON" | jq -r '.number // empty')
+          if [ -z "$PR_NUM" ]; then
+            echo "::error::Failed to open infra PR: $PR_JSON"
+            exit 1
+          fi
+          echo "Opened cartsnitch/infra PR #${PR_NUM}"
+          REVIEW_HTTP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{"reviewers":["cs_savannah"]}' \
+            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/requested_reviewers")
+          if [ "${REVIEW_HTTP}" -lt 200 ] || [ "${REVIEW_HTTP}" -ge 300 ]; then
+            echo "::notice::Failed to request reviewers for cartsnitch/infra PR #${PR_NUM} (HTTP ${REVIEW_HTTP}); continuing"
+          fi
+          # CAR-1216: see deploy-dev — same never-fail on merge outcome.
+          MERGE_RESP=$(curl -sS -X POST \
+            -H "Authorization: token ${CI_GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d '{"Do":"merge","delete_branch_after_merge":true}' \
+            "https://git.farh.net/api/v1/repos/cartsnitch/infra/pulls/${PR_NUM}/merge")
+          MERGED=$(echo "$MERGE_RESP" | jq -r '.merged // false')
+          if [ "$MERGED" = "true" ]; then
+            echo "PR #${PR_NUM} merged into cartsnitch/infra uat"
+          elif echo "$MERGE_RESP" | grep -qi 'does not have enough approvals'; then
+            echo "::notice::infra PR #${PR_NUM} opened and awaiting CTO (cs_savannah) approve+merge — GitOps approval gate, not a failure"
+            exit 0
+          else
+            echo "::error::Auto-merge of cartsnitch/infra PR #${PR_NUM} failed: $MERGE_RESP"
+            exit 1
+          fi
Author	SHA1	Message	Date
Barcode Betty	1233d80c8f	Merge pull request 'ci(CAR-1373): apply dev's deploy-job restoration to uat (dev → uat promotion, 3-way resolved)' (#38 ) from car-1373-uat-merge-resolved into uat CI / build-and-push (push) Failing after 10s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Successful in 2s Details	2026-06-12 02:09:22 +00:00
Barcode Betty	89fb02cdea	ci(CAR-1373): apply dev's deploy-job restoration to uat (resolve 3-way) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details The dev→uat 3-way merge of ci.yml conflicts on: - CalVer logic (dev is the multi-line readable form) - ref: main vs parameterized expression (dev wins, per CAR-1374) - PR body base/head: dev wins (per CAR-1371 + acceptance criteria) - CAR-1216 comment: dev added, uat didn't have it Resolution: take dev's version of ci.yml (the corrected form per CAR-1373). cc @cpfarhood	2026-06-10 22:47:36 +00:00
Savannah Savings	8a49fc57f1	Merge pull request 'fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270)' (#34 ) from betty/car-1270-ci-gitea-token-uat into uat CI / build-and-push (push) Successful in 9s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 7s Details	2026-06-05 05:12:38 +00:00
Barcode Betty	d5c5d2b6ba	fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-05 00:53:13 +00:00
Barcode Betty	3198b21683	revert: undo CAR-1270 direct commit (will land via PR instead) CI / build-and-push (push) Failing after 12m22s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 27s Details Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-05 00:52:22 +00:00
Barcode Betty	ca1a732033	fix(ci): use CI_GITEA_TOKEN for cross-repo infra access in deploy jobs (CAR-1270) CI / build-and-push (push) Successful in 7s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 5s Details Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-05 00:51:07 +00:00
Savannah Savings	eb436e2c31	Merge pull request 'ci(auth): migrate deploy-dev/deploy-uat to PR-bump mechanism (CAR-1263)' (#32 ) from cs_betty/car-1263-auth-pr-bump-uat into uat CI / build-and-push (push) Failing after 6s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 25s Details	2026-06-05 00:34:47 +00:00
Barcode Betty	70398efeea	ci(auth): migrate deploy-dev/deploy-uat to PR-bump mechanism (CAR-1263) CI / build-and-push (pull_request) Has been skipped Details CI / deploy-dev (pull_request) Has been skipped Details CI / deploy-uat (pull_request) Has been skipped Details Migrates auth .gitea/workflows/ci.yml deploy-dev and deploy-uat jobs from direct 'git push origin main' to cartsnitch/infra to the CAR-1195 PR-bump pattern (open + (attempt) auto-merge an infra PR; never hard-fail on approval gate, per CAR-1216). Brings auth in line with cartsnitch/cartsnitch and stops the red deploy-uat job on every uat push. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-05 00:23:05 +00:00
Savannah Savings	806843b9c7	Merge pull request 'ci(uat): runner-native Docker build + fix deploy infra token (CAR-1237)' (#30 ) from betty/car-1237-fix-uat-ci into uat CI / build-and-push (push) Successful in 15s Details CI / deploy-dev (push) Has been skipped Details CI / deploy-uat (push) Failing after 37s Details ci(uat): runner-native Docker build + fix deploy infra token (CAR-1237) Reviewed and merged by Savannah (CTO). Byte-identical to proven main except the spec-mandated REGISTRY_TOKEN registry-login (CAR-1009 standard). Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-06-04 20:41:13 +00:00