cs_betty/cartsnitch-fork-test
1
0
Fork 0
forked from cartsnitch/cartsnitch
Code Pull Requests Activity

fix(cartsnitch): deploy-dev/deploy-uat checkout ref must match PR base (CAR-1374)

Browse Source 
Parameterize the actions/checkout ref for cartsnitch/infra in deploy-dev
and deploy-uat so the head branch lineage matches the PR base:
  - main push -> ref: main, base: main (unchanged)
  - dev push  -> ref: dev,  base: dev
  - uat push  -> ref: uat,  base: uat

Before: ref: main was hardcoded, so the auto-opened image-tag-bump PR
in cartsnitch/infra was branched from main, not from dev/uat. With the
CAR-1371 base=dev/base=uat change, the diff ballooned to 30+ files and
the PR was unmergeable (see cartsnitch/infra#392).

Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
Barcode Betty
2026-06-10 22:16:38 +00:00
parent 8c8236d6e5
commit eb899c46bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/ci.yml
+2 -2
View File
@@ -484,7 +484,7 @@ jobs:
with: with:
repository: cartsnitch/infra repository: cartsnitch/infra
token: ${{ secrets.CI_GITEA_TOKEN }} token: ${{ secrets.CI_GITEA_TOKEN }}
ref: main ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
path: infra path: infra
- name: Install kubectl - name: Install kubectl
@@ -630,7 +630,7 @@ jobs:
with: with:
repository: cartsnitch/infra repository: cartsnitch/infra
token: ${{ secrets.CI_GITEA_TOKEN }} token: ${{ secrets.CI_GITEA_TOKEN }}
ref: main ref: ${{ github.ref == 'refs/heads/main' && 'main' || (github.ref == 'refs/heads/uat' && 'uat' || 'dev') }}
path: infra path: infra
- name: Install kubectl - name: Install kubectl