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

1 Commits

Author SHA1 Message Date
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