Skip to content

release: merge dev into main - #49

Merged
notchjpl merged 5 commits into
mainfrom
dev
Aug 17, 2026
Merged

release: merge dev into main#49
notchjpl merged 5 commits into
mainfrom
dev

Conversation

@notchjpl

Copy link
Copy Markdown
Contributor

Release PR: merges dev into main.

Labelled release + patch so Auto Release on Main Merge cuts a patch release on merge, which in turn triggers the production build.

What this carries

  • BUILD_TIME build-arg + buildtime step in the build workflows. aws_prod_release.yml on main is the file a release build actually uses (the tag points at a main commit), so prod images only start reporting a build time once this is merged.
  • paths-ignore: ['argo/**'] on the dev build trigger — now the only guard against the rebuild loop, since [skip ci] has been removed from the Argo CD Image Updater commit template.
  • Whatever else is already on dev for this app. Please review the file list before merging; some repos carry unreleased application work.

Why the label test matters

Until today, dev -> main release PRs were being silently dropped: Image Updater stamped [skip ci] on its digest write-back commit, that commit became the tip of dev, and GitHub applies [skip ci] to pull_request events too — keyed on the PR HEAD commit. No workflow run, no check suite, no release. Twelve releases had to be cut by hand.

[skip ci] has since been removed from the template (infra-terraform k8-mgmt/argo.tf) and replaced by the path filter, and every repo's dev HEAD has been verified clean of it. Merging this PR with the labels attached is the end-to-end confirmation that Auto Release fires on its own again.

Terraform and others added 4 commits August 16, 2026 19:11
…dfd5557aa314d8f029b08bc402862f6c [skip ci]

Written by argocd-image-updater for application virtual-pet-dev.
@notchjpl
notchjpl requested a review from cpsiaki as a code owner August 16, 2026 22:54
@notchjpl
notchjpl requested a review from LinaBell as a code owner August 16, 2026 22:54
@notchjpl notchjpl added the patch label Aug 16, 2026
@notchjpl
notchjpl requested a review from liebeskind as a code owner August 16, 2026 22:54
* chore: expose COMMIT_HASH and BUILD_TIME on the health endpoint

CI already passed COMMIT_HASH as a docker build-arg, but the Dockerfile
never declared the ARG, so the value was discarded and the health check
could not report which commit is running.

Declare ARG COMMIT_HASH and ARG BUILD_TIME in the final stage and promote
both to ENV so they reach the process regardless of the start script, stamp
BUILD_TIME in CI, and surface both on /api/system/health.

BUILD_TIME identifies the image rather than the container, so unlike
serverStartDate it survives restarts and is usable as a release reference.

* chore: drop workflow edits, Terraform owns those files

The build workflows are generated from config_texts and written by
Terraform to dev, which already carries the buildtime step, the
BUILD_TIME build-arg and the argo/ paths-ignore guard. Keeping a
second copy here only caused merge conflicts and risked reverting
paths-ignore. This PR now changes just the Dockerfile and the
health route.

---------

Co-authored-by: jplorier <jplorier@users.noreply.github.com>
@notchjpl
notchjpl merged commit dc5808f into main Aug 17, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant