Skip to content

fix(ci): deploy the merged commit's own image, not whatever :latest points at (CCP-5824) #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barrfalk merged 3 commits into from
Oct 6, 2026
Merged

fix(ci): deploy the merged commit's own image, not whatever :latest points at (CCP-5824) #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aacac48
fix(ci): deploy the merged commit's own image, not whatever :latest p…
NikhilMM89 Oct 2, 2026
0ea3fb4
fix(charts): raise the promtail sidecar memory limit from 128Mi to 256Mi
NikhilMM89 Oct 6, 2026
2b0cf28
Merge branch 'main' into fix/ccp-5824-merge-image-race
NikhilMM89 Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,28 @@ jobs:
timeout-minutes: 10
steps:
- uses: bcgov/action-builder-ghcr@cb2629351c87dd1c2130073e4ebb7233a9653a63 # v4.4.1
id: build
with:
package: ${{ matrix.package }}
tags: dev
tag_fallback: latest
# Diff the merge commit against the previous main; diff_branch defaults to
# main, which on a push to main is always empty so nothing ever built.
diff_branch: HEAD^
# :latest is whichever image was tagged most recently by any build.
tag_fallback: dev
triggers: ('${{ matrix.package }}/')

- name: Report deployed image
shell: bash
env:
PKG: ${{ matrix.package }}
TRIGGERED: ${{ steps.build.outputs.triggered }}
DIGEST: ${{ steps.build.outputs.digest }}
run: |
[ "${TRIGGERED}" = "true" ] && SRC="fresh build of ${GITHUB_SHA}" || SRC="retagged existing :dev (unchanged)"
echo "${PKG}: ${SRC} (digest ${DIGEST:-none})"
echo "- **${PKG}**: ${SRC} — \`${DIGEST:-none}\`" >> "${GITHUB_STEP_SUMMARY}"

import:
name: Import to ImageStream
needs: [builds]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr-open.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ jobs:
with:
package: ${{ matrix.package }}
tags: ${{ github.event.number }}
tag_fallback: latest
# :latest is whichever image was tagged most recently by any build.
tag_fallback: dev
triggers: ('${{ matrix.package }}/')

import:
Expand Down
9 changes: 6 additions & 3 deletions charts/app/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,14 @@ frontend:
environment: ~
#-- Job name for logs (auto-generated if not set)
jobName: ~
#-- Resource requests and limits for Promtail sidecar
#-- Resource requests and limits for Promtail sidecar.
#-- 128Mi was too tight: promtail idles at 60-110Mi in prod, so pods sat at
#-- 85% of the limit and ContainerMemoryHigh fired. An OOMKill here is silent
#-- (the app container is unaffected) and stops frontend logs reaching Loki.
resources:
requests:
cpu: 50m
memory: 64Mi
memory: 128Mi
limits:
cpu: 200m
memory: 128Mi
memory: 256Mi
Loading