Skip to content

fix: CI appVersion mismatch + Helm OCI namespace collision #67

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
thepagent merged 1 commit into from
Apr 6, 2026
Merged

fix: CI appVersion mismatch + Helm OCI namespace collision #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 19 additions & 18 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,33 +189,34 @@ jobs:
fi
echo "new_version=$new_version" >> "$GITHUB_OUTPUT"

- name: Resolve image SHA
id: image-sha
run: |
# Use the commit SHA that triggered this build — this is the SHA
# that merge-manifests tagged the Docker image with (type=sha,prefix=).
# We capture it here explicitly so it survives the bump commit.
IMAGE_SHA="${{ github.sha }}"
IMAGE_SHA="${IMAGE_SHA:0:7}"
echo "sha=${IMAGE_SHA}" >> "$GITHUB_OUTPUT"

- name: Update Chart.yaml and values.yaml
run: |
SHORT_SHA="${{ github.sha }}"
SHORT_SHA="${SHORT_SHA:0:7}"
IMAGE_SHA="${{ steps.image-sha.outputs.sha }}"
sed -i "s/^version: .*/version: ${{ steps.bump.outputs.new_version }}/" charts/agent-broker/Chart.yaml
sed -i "s/^appVersion: .*/appVersion: \"${SHORT_SHA}\"/" charts/agent-broker/Chart.yaml
sed -i "s/^appVersion: .*/appVersion: \"${IMAGE_SHA}\"/" charts/agent-broker/Chart.yaml
sed -i "s|repository: .*|repository: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}|" charts/agent-broker/values.yaml
sed -i "s/tag: .*/tag: \"${SHORT_SHA}\"/" charts/agent-broker/values.yaml
sed -i "s/tag: .*/tag: \"${IMAGE_SHA}\"/" charts/agent-broker/values.yaml

- name: Create bump PR
- name: Push chart bump directly to main
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
run: |
VERSION="${{ steps.bump.outputs.new_version }}"
BRANCH="chore/chart-${VERSION}"
IMAGE_SHA="${{ steps.image-sha.outputs.sha }}"
git config user.name "openclaw-helm-bot[bot]"
git config user.email "3185992+openclaw-helm-bot[bot]@users.noreply.github.com"
git checkout -b "$BRANCH"
git add charts/agent-broker/Chart.yaml charts/agent-broker/values.yaml
git commit -m "chore: bump chart to ${VERSION}"
git push origin "$BRANCH"
if [[ "$VERSION" == *-beta* ]]; then
LABEL="beta"
else
LABEL="stable"
fi
gh pr create \
--title "chore: bump chart to ${VERSION}" \
--body "Auto-generated chart version bump (${LABEL}) for image \`${{ github.sha }}\`." \
--base main --head "$BRANCH"
git commit -m "chore: bump chart to ${VERSION} [skip ci]

image: ${IMAGE_SHA}"
git push origin main
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
NAME=$(grep '^name:' ${CHART}/Chart.yaml | awk '{print $2}')
VERSION=$(grep '^version:' ${CHART}/Chart.yaml | awk '{print $2}')
helm package ${CHART}
helm push ${NAME}-${VERSION}.tgz oci://ghcr.io/${{ github.repository_owner }}
helm push ${NAME}-${VERSION}.tgz oci://ghcr.io/${{ github.repository_owner }}/charts

- name: Append OCI install instructions to release notes
env:
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:

### OCI Registry
\`\`\`bash
helm install agent-broker oci://ghcr.io/${OWNER}/agent-broker --version ${VERSION}
helm install agent-broker oci://ghcr.io/${OWNER}/charts/agent-broker --version ${VERSION}
\`\`\`
EOF

Expand Down