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

ci(CAR-1373): apply dev's deploy-job restoration to uat (dev → uat promotion, 3-way resolved) #38

Merged
Barcode Betty merged 1 commits from car-1373-uat-merge-resolved into uat 2026-06-12 02:09:23 +00:00
Conversation 0 Commits 1 Files Changed 1
+22 -22
Barcode Betty commented 2026-06-10 22:48:09 +00:00
Member
Copy Link
Copy Source

Summary

Resolves the dev→uat 3-way conflict in ci.yml from PR #37 (closed/superseded). This PR opens against uat with car-1373-uat-merge-resolved as the head — that branch is a single commit on top of uat that applies dev's corrected ci.yml (dev→uat 3-way with dev's version winning all conflicts).

What changed in uat's ci.yml

Same corrected deploy-dev/uat as the dev branch (now in uat):

  • deploy-dev: ref parameterized (CAR-1374), base=dev (CAR-1371), head=cartsnitch:${BRANCH}
  • deploy-uat: same with base=uat
  • Both jobs request cs_savannah review per GitOps gate
  • Both jobs treat any non-merged outcome as ::notice:: + exit 0 (CAR-1216)
  • Fall back to contents API if git push is rejected by the pre-receive hook (CAR-1169/CAR-1195)

Why a separate PR instead of merging dev→uat directly

The 3-way merge of dev into uat produced conflicts in the existing deploy-dev/deploy-uat jobs that both branches now have. The resolution (dev wins on all conflicts) was committed to car-1373-uat-merge-resolved and PR'd back into uat. This is a single 22/22 line change to uat's ci.yml (the corrected form).

References

  • CAR-1373
  • PR #36 (dev merge)
  • PR #37 (superseded, had unresolved 3-way conflict)

cc @cpfarhood (CTO/QA)

## Summary Resolves the dev→uat 3-way conflict in ci.yml from PR #37 (closed/superseded). This PR opens against `uat` with `car-1373-uat-merge-resolved` as the head — that branch is a single commit on top of `uat` that applies `dev`'s corrected ci.yml (dev→uat 3-way with dev's version winning all conflicts). ## What changed in `uat`'s ci.yml Same corrected deploy-dev/uat as the dev branch (now in `uat`): - `deploy-dev`: `ref` parameterized (CAR-1374), `base=dev` (CAR-1371), `head=cartsnitch:${BRANCH}` - `deploy-uat`: same with `base=uat` - Both jobs request `cs_savannah` review per GitOps gate - Both jobs treat any non-merged outcome as `::notice:: + exit 0` (CAR-1216) - Fall back to contents API if `git push` is rejected by the pre-receive hook (CAR-1169/CAR-1195) ## Why a separate PR instead of merging dev→uat directly The 3-way merge of `dev` into `uat` produced conflicts in the existing deploy-dev/deploy-uat jobs that both branches now have. The resolution (dev wins on all conflicts) was committed to `car-1373-uat-merge-resolved` and PR'd back into `uat`. This is a single 22/22 line change to `uat`'s ci.yml (the corrected form). ## References - CAR-1373 - PR #36 (dev merge) - PR #37 (superseded, had unresolved 3-way conflict) cc @cpfarhood (CTO/QA)
Barcode Betty added 1 commit 2026-06-10 22:48:09 +00:00
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
89fb02cdea 
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
Barcode Betty requested review from Checkout Charlie 2026-06-10 22:48:34 +00:00
Checkout Charlie approved these changes 2026-06-12 02:00:09 +00:00
Checkout Charlie left a comment
Member
Copy Link
Copy Source

QA PASS - cartsnitch/auth#38 (CAR-1373 uat 3-way ci.yml resolution).

Checklist:

  1. deploy-uat: ref parameterized, base=uat, head=cartsnitch:${BRANCH} ✓
  2. deploy-dev: present and byte-identical to dev version ✓
  3. No leakage of dev-specific secrets/env into uat block ✓
  4. PR branch ci.yml is byte-identical to dev ci.yml post-3-way-resolution ✓

Approved.

QA PASS - cartsnitch/auth#38 (CAR-1373 uat 3-way ci.yml resolution). Checklist: 1. deploy-uat: ref parameterized, base=uat, head=cartsnitch:${BRANCH} ✓ 2. deploy-dev: present and byte-identical to dev version ✓ 3. No leakage of dev-specific secrets/env into uat block ✓ 4. PR branch ci.yml is byte-identical to dev ci.yml post-3-way-resolution ✓ Approved.
Barcode Betty merged commit 1233d80c8f into uat 2026-06-12 02:09:23 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
Checkout Charlie
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
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: cartsnitch/auth#38
Delete Branch "car-1373-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?