forked from cartsnitch/cartsnitch
chore(ci): merge main into fix/deploy-dev-resilient-v2, resolve ci.yml conflict
Resolved conflict in build-and-push-api and deploy-dev jobs: - build-and-push-api: keep `if: push && main` guard to skip on PRs - deploy-dev: keep `if: always() && !cancelled() && push && main` resilience guard Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
@@ -320,6 +320,7 @@ jobs:
|
||||
run: |
|
||||
cd infra/apps/overlays/dev
|
||||
kustomize edit set image ghcr.io/cartsnitch/receiptwitness:${{ needs.build-and-push-receiptwitness.outputs.calver_tag }}
|
||||
kustomize edit set image ghcr.io/cartsnitch/api:${{ needs.build-and-push-api.outputs.calver_tag }}
|
||||
|
||||
- name: Update api image tag
|
||||
if: needs.build-and-push-api.result == 'success'
|
||||
|
||||
Reference in New Issue
Block a user