Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Include p987 in the release version bump

When the next mapache release runs, this newly advances the p987 deployment to the release image, but scripts/release.sh still excludes p987 from GO_CONFIG_SERVICES; consequently p987/config/config.go remains at 0.1.0, so the deployed service's banner and /p987/ping response report the wrong version. Add p987 to the release script's Go service list so the image tag and runtime version stay synchronized.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge List p987 in the generated deployment PR

For every release that changes the p987 pin, the generated infrastructure PR body remains incomplete because the changelog loop reads the unchanged SERVICES value on line 23, which omits p987. Reviewers will therefore be told that only six images are being advanced even though this allowlist now modifies seven; add p987 to SERVICES as well.

Useful? React with 👍 / 👎.

inmap==1 && $1=="newTag:" { sub(/newTag:[[:space:]]*.*/, "newTag: " new); inmap=0 }
{ print }
' "infra/$KUSTOMIZATION" > "infra/$KUSTOMIZATION.tmp" && mv "infra/$KUSTOMIZATION.tmp" "infra/$KUSTOMIZATION"
Expand Down
2 changes: 1 addition & 1 deletion auth/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gr26/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion live/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
10 changes: 5 additions & 5 deletions scripts/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand All @@ -27,7 +27,7 @@ usage() {
Usage: $0 [-t target] <version>

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

Expand Down Expand Up @@ -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 ==="
Expand Down Expand Up @@ -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[@]}")
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion vehicle/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading