From ff4638085220da20d4b80bccd312fb83a8876aa9 Mon Sep 17 00:00:00 2001 From: Bharat Kathi Date: Sat, 29 Aug 2026 09:51:04 -0700 Subject: [PATCH 1/3] ci: gate on the p987 build and bump its tag on release The aggregate build check waited on six services, so a p987 image failure would not have blocked a merge. Also add p987 to the release tag-bump allowlist in deploy.yml. That awk matches an explicit list of images rather than mapache/* as a whole, so without this its pinned tag in the infra kustomization would sit at whatever it was first set to while every other service moved forward. --- .github/workflows/build.yml | 3 ++- .github/workflows/deploy.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 83b3823b..9edb0123 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: build run-name: Check Mapache service builds -# Aggregates the six per-service image builds into one check so branch +# Aggregates the per-service image builds into one check so branch # protection has a single required status to gate on. # # Only the image builds are waited on. mapache-go / mapache-py run on @@ -95,4 +95,5 @@ jobs: wait_for_workflow "gr26" "gr26.yml" wait_for_workflow "live" "live.yml" wait_for_workflow "query" "query.yml" + wait_for_workflow "p987" "p987.yml" wait_for_workflow "dashboard" "dashboard.yml" diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index aa06fb1e..4ab4b5f8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,7 +77,7 @@ jobs: # Surgically rewrite the newTag of each mapache/* image only, leaving # kerbecs and all comments/formatting untouched for a clean diff. awk -v new="$NEW" ' - $0 ~ "- name: ghcr.io/gaucho-racing/mapache/(auth|vehicle|gr26|live|query|dashboard)$" { inmap=1; print; next } + $0 ~ "- name: ghcr.io/gaucho-racing/mapache/(auth|vehicle|gr26|p987|live|query|dashboard)$" { inmap=1; print; next } inmap==1 && $1=="newTag:" { sub(/newTag:[[:space:]]*.*/, "newTag: " new); inmap=0 } { print } ' "infra/$KUSTOMIZATION" > "infra/$KUSTOMIZATION.tmp" && mv "infra/$KUSTOMIZATION.tmp" "infra/$KUSTOMIZATION" From 5fec14e7cdb4b56aad51147ea336e9b386b7cc2f Mon Sep 17 00:00:00 2001 From: Bharat Kathi Date: Sat, 29 Aug 2026 09:55:11 -0700 Subject: [PATCH 2/3] chore: include p987 in the release script Bumps its Version constant on a services release and its mapache-go dependency on a library release, alongside the other Go services. --- scripts/release.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/release.sh b/scripts/release.sh index 9aa89ebd..f43e60d7 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -14,7 +14,7 @@ set -euo pipefail # every dependent Go service and pushes a chore commit. # # ./scripts/release.sh 3.1.0 (default -t mapache) -# Cuts the services release (auth/gr26/live/vehicle/query). Bumps each +# Cuts the services release (auth/gr26/p987/live/vehicle/query). Bumps each # service's Version constant or pyproject.toml, commits, tags v3.1.0, # and lets the per-service workflows publish images. # @@ -27,7 +27,7 @@ usage() { Usage: $0 [-t target] Targets: - mapache services (auth, gr26, live, vehicle, query) — default + mapache services (auth, gr26, p987, live, vehicle, query) — default mapache-py Python library; also bumps lockfiles in dependent services mapache-go Go library; also bumps go.mod in dependent services @@ -227,7 +227,7 @@ case "$TARGET" in exit 1 fi - GO_DEPENDENTS=("gr26" "live" "vehicle") + GO_DEPENDENTS=("gr26" "p987" "live" "vehicle") echo "" echo "=== Release Summary ===" @@ -295,7 +295,7 @@ case "$TARGET" in exit 1 fi - GO_CONFIG_SERVICES=("auth" "gr26" "live" "vehicle") + GO_CONFIG_SERVICES=("auth" "gr26" "p987" "live" "vehicle") PY_SERVICES=("query") NODE_SERVICES=("dashboard") ALL_SERVICES=("${GO_CONFIG_SERVICES[@]}" "${PY_SERVICES[@]}" "${NODE_SERVICES[@]}") From 08b12f6d7850eca4675be92d062a5ad311491111 Mon Sep 17 00:00:00 2001 From: Bharat Kathi Date: Sat, 29 Aug 2026 09:55:37 -0700 Subject: [PATCH 3/3] chore: keep the release version bump gofmt-clean MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The sed rewrote the Version line with a hardcoded five-space gap, which gofmt wants collapsed to one — so every services release left all four Go service configs unformatted. Fix the replacement and reformat the files it had already touched. --- auth/config/config.go | 2 +- gr26/config/config.go | 2 +- live/config/config.go | 2 +- scripts/release.sh | 2 +- vehicle/config/config.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/auth/config/config.go b/auth/config/config.go index 38469f81..193b830c 100644 --- a/auth/config/config.go +++ b/auth/config/config.go @@ -21,7 +21,7 @@ func (s ServiceInfo) PathPrefix() string { var Service = ServiceInfo{ Name: "Auth", - Version: "3.9.9", + Version: "3.9.9", } var SkipAuthCheck = os.Getenv("SKIP_AUTH_CHECK") == "true" diff --git a/gr26/config/config.go b/gr26/config/config.go index 3f955508..83cbcb60 100644 --- a/gr26/config/config.go +++ b/gr26/config/config.go @@ -21,7 +21,7 @@ func (s ServiceInfo) PathPrefix() string { var Service = ServiceInfo{ Name: "GR26", - Version: "3.9.9", + Version: "3.9.9", } var SkipAuthCheck = os.Getenv("SKIP_AUTH_CHECK") == "true" diff --git a/live/config/config.go b/live/config/config.go index 94ee0b9a..622c4335 100644 --- a/live/config/config.go +++ b/live/config/config.go @@ -21,7 +21,7 @@ func (s ServiceInfo) PathPrefix() string { var Service = ServiceInfo{ Name: "Live", - Version: "3.9.9", + Version: "3.9.9", } var Env = os.Getenv("ENV") diff --git a/scripts/release.sh b/scripts/release.sh index f43e60d7..fe2b344e 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -331,7 +331,7 @@ case "$TARGET" in fi for svc in "${GO_CONFIG_SERVICES[@]}"; do - sed -i '' "s/Version:.*\".*\"/Version: \"${SEMVER}\"/" "${REPO_ROOT}/${svc}/config/config.go" + sed -i '' "s/Version:.*\".*\"/Version: \"${SEMVER}\"/" "${REPO_ROOT}/${svc}/config/config.go" done for svc in "${PY_SERVICES[@]}"; do sed -i '' "s/^version = \".*\"/version = \"${SEMVER}\"/" "${REPO_ROOT}/${svc}/pyproject.toml" diff --git a/vehicle/config/config.go b/vehicle/config/config.go index 17f56328..43b0e259 100644 --- a/vehicle/config/config.go +++ b/vehicle/config/config.go @@ -21,7 +21,7 @@ func (s ServiceInfo) PathPrefix() string { var Service = ServiceInfo{ Name: "Vehicle", - Version: "3.9.9", + Version: "3.9.9", } var Env = os.Getenv("ENV")