cartsnitch/auth
12
0
Fork 1
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): apply jq title fix to uat (CAR-1436 resolved) #47

Merged
Barcode Betty merged 1 commits from car-1436-uat-merge-resolved into uat 2026-06-23 00:42:32 +00:00
Conversation 0 Commits 1 Files Changed 1
+16 -14
Barcode Betty commented 2026-06-23 00:42:17 +00:00
Member
Copy Link
Copy Source

Replaces #45 — applies the CAR-1436 fix to uat via 3-way resolution branch.

PR #45 was mergeable: false because uat and dev had diverged significantly in ci.yml (uat had base: "main" hardcoded, title computed inside jq program; dev had CAR-1371/1374 form with --arg base + broken --arg title). This resolution branch starts from uat and takes dev's corrected form wholesale:

  • deploy-dev: TITLE="ci(dev): update auth image (${GITHUB_SHA::12})" + --arg base dev
  • deploy-uat: TITLE="ci(uat): update auth image (${GITHUB_SHA::12})" + --arg base uat

This also corrects the base: "main" hardcode present in uat.

PR #45 will be closed as superseded.

QA already verified on dev side (run 3795, infra PR #406 opened successfully). Same fix now on uat.

Replaces #45 — applies the CAR-1436 fix to `uat` via 3-way resolution branch. PR #45 was `mergeable: false` because `uat` and `dev` had diverged significantly in ci.yml (uat had `base: "main"` hardcoded, title computed inside jq program; dev had CAR-1371/1374 form with `--arg base` + broken `--arg title`). This resolution branch starts from uat and takes dev's corrected form wholesale: - `deploy-dev`: `TITLE="ci(dev): update auth image (${GITHUB_SHA::12})"` + `--arg base dev` - `deploy-uat`: `TITLE="ci(uat): update auth image (${GITHUB_SHA::12})"` + `--arg base uat` This also corrects the `base: "main"` hardcode present in uat. PR #45 will be closed as superseded. QA already verified on dev side (run 3795, infra PR #406 opened successfully). Same fix now on uat.
Barcode Betty added 1 commit 2026-06-23 00:42:18 +00:00
fix(ci): resolve dev→uat merge conflict, apply jq title fix (CAR-1436)
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
011264a87b
Barcode Betty merged commit 9600de923c into uat 2026-06-23 00:42:32 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something isn't working
 documentation
Improvements or additions to documentation
 duplicate
This issue or pull request already exists
 enhancement
New feature or request
 good first issue
Good for newcomers
 help wanted
Extra attention is needed
 invalid
This doesn't seem right
 question
Further information is requested
 wontfix
This will not be worked on
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ai-review (AI Review) cs_betty (Barcode Betty) cs_charlie (Checkout Charlie) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) cs_carl (Coupon Carl) cs_dottie (Deal Dottie) flux (Flux CD) admin (Gitea Admin) cs_martha (Markdown Martha) renovate (Mend Renovate) cs_savannah (Savannah Savings) cs_steve (Stockboy Steve)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: cartsnitch/auth#47
Delete Branch "car-1436-uat-merge-resolved"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?