From 1c1e4d4b2b2a5585e4aa5757d7e68c74f4a247a1 Mon Sep 17 00:00:00 2001 From: Noooste <83548733+Noooste@users.noreply.github.com> Date: Sun, 21 Jun 2026 23:20:44 +0200 Subject: [PATCH] chore: update Helm chart version to 0.8.2 and adjust README badges Signed-off-by: Noooste <83548733+Noooste@users.noreply.github.com> --- .github/workflows/chart-release.yml | 3 +- .github/workflows/release-please.yml | 84 ---------------------------- .release-please-manifest.json | 3 +- helm/garage-ui/Chart.yaml | 4 +- helm/garage-ui/README.md | 4 +- release-please-config.json | 16 +----- 6 files changed, 10 insertions(+), 104 deletions(-) diff --git a/.github/workflows/chart-release.yml b/.github/workflows/chart-release.yml index 2e9643f..0eb6872 100644 --- a/.github/workflows/chart-release.yml +++ b/.github/workflows/chart-release.yml @@ -3,7 +3,8 @@ name: chart-release on: push: tags: - - 'garage-ui-chart-v*' + - 'v[0-9]+.[0-9]+.[0-9]+' + - 'v[0-9]+.[0-9]+.[0-9]+-*' workflow_dispatch: permissions: diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index e1a3ae9..1eb2ee9 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -25,87 +25,3 @@ jobs: config-file: release-please-config.json manifest-file: .release-please-manifest.json token: ${{ steps.app-token.outputs.token }} - - - name: Sync Chart.yaml appVersion on release PR - if: ${{ steps.rp.outputs.prs_created == 'true' }} - env: - GH_TOKEN: ${{ steps.app-token.outputs.token }} - PRS: ${{ steps.rp.outputs.prs }} - REPO: ${{ github.repository }} - run: | - set -euo pipefail - echo "$PRS" | jq -c '.[]' | while read -r pr; do - branch=$(echo "$pr" | jq -r '.headBranchName') - workdir=$(mktemp -d) - git clone --branch "$branch" --depth 1 \ - "https://x-access-token:${GH_TOKEN}@github.com/${REPO}.git" "$workdir" - cd "$workdir" - git config user.email "garage-ui-release-bot[bot]@users.noreply.github.com" - git config user.name "garage-ui-release-bot[bot]" - - version=$(jq -r '."."' .release-please-manifest.json) - target="v${version}" - sed -i -E "s|^appVersion:.*|appVersion: ${target}|" helm/garage-ui/Chart.yaml - - if ! git diff --quiet helm/garage-ui/Chart.yaml; then - git add helm/garage-ui/Chart.yaml - git commit -m "chore: sync Chart.yaml appVersion to ${target}" - git push origin "$branch" - fi - cd - - rm -rf "$workdir" - done - - - name: Cut chart patch when backend released without chart - if: ${{ steps.rp.outputs.releases_created == 'true' }} - env: - GH_TOKEN: ${{ steps.app-token.outputs.token }} - REPO: ${{ github.repository }} - BACKEND_RELEASED: ${{ steps.rp.outputs.release_created }} - CHART_RELEASED: ${{ steps.rp.outputs['helm/garage-ui--release_created'] }} - BACKEND_TAG: ${{ steps.rp.outputs.tag_name }} - BACKEND_VERSION: ${{ steps.rp.outputs.version }} - run: | - set -euo pipefail - if [ "$BACKEND_RELEASED" != "true" ] || [ "$CHART_RELEASED" = "true" ]; then - echo "Backend not released, or chart already released this cycle. Nothing to do." - exit 0 - fi - - workdir=$(mktemp -d) - git clone \ - "https://x-access-token:${GH_TOKEN}@github.com/${REPO}.git" "$workdir" - cd "$workdir" - git config user.email "garage-ui-release-bot[bot]@users.noreply.github.com" - git config user.name "garage-ui-release-bot[bot]" - - chart_old=$(jq -r '."helm/garage-ui"' .release-please-manifest.json) - chart_new=$(echo "$chart_old" | awk -F. '{printf "%d.%d.%d", $1, $2, $3+1}') - chart_tag="garage-ui-chart-v${chart_new}" - - jq --arg v "$chart_new" '."helm/garage-ui" = $v' \ - .release-please-manifest.json > .release-please-manifest.json.tmp - mv .release-please-manifest.json.tmp .release-please-manifest.json - - sed -i -E "s|^version:.*|version: ${chart_new}|" helm/garage-ui/Chart.yaml - sed -i -E "s|^appVersion:.*|appVersion: ${BACKEND_TAG}|" helm/garage-ui/Chart.yaml - - today=$(date -u +%Y-%m-%d) - compare_url="https://github.com/${REPO}/compare/garage-ui-chart-v${chart_old}...${chart_tag}" - entry=$(printf '## [%s](%s) (%s)\n\n\n### Miscellaneous Chores\n\n* sync chart appVersion to %s\n' \ - "$chart_new" "$compare_url" "$today" "$BACKEND_TAG") - awk -v entry="$entry" 'NR==1 && /^# Changelog/ { print; print ""; print entry; next } { print }' \ - helm/garage-ui/CHANGELOG.md > helm/garage-ui/CHANGELOG.md.tmp - mv helm/garage-ui/CHANGELOG.md.tmp helm/garage-ui/CHANGELOG.md - - git add .release-please-manifest.json helm/garage-ui/Chart.yaml helm/garage-ui/CHANGELOG.md - git commit -m "chore: bump chart to ${chart_new} for backend ${BACKEND_TAG}" - git push origin main - - git tag "$chart_tag" - git push origin "$chart_tag" - - gh release create "$chart_tag" \ - --repo "$REPO" \ - --title "$chart_tag" \ - --notes "Chart patch synced to backend ${BACKEND_TAG}. No chart template changes." diff --git a/.release-please-manifest.json b/.release-please-manifest.json index b80bb37..2e1c40e 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,4 +1,3 @@ { - ".": "0.8.2", - "helm/garage-ui": "0.6.1" + ".": "0.8.2" } diff --git a/helm/garage-ui/Chart.yaml b/helm/garage-ui/Chart.yaml index 0b49735..3ce7538 100644 --- a/helm/garage-ui/Chart.yaml +++ b/helm/garage-ui/Chart.yaml @@ -3,8 +3,8 @@ name: garage-ui description: A Helm chart for Garage UI - Web interface for Garage S3 object storage icon: https://helm.noste.dev/garage.png type: application -version: 0.6.1 -appVersion: v0.8.2 +version: 0.8.2 # x-release-please-version +appVersion: v0.8.2 # x-release-please-version keywords: - garage - s3 diff --git a/helm/garage-ui/README.md b/helm/garage-ui/README.md index 15858cc..150264d 100644 --- a/helm/garage-ui/README.md +++ b/helm/garage-ui/README.md @@ -2,8 +2,8 @@ A Helm chart for deploying [Garage UI](https://github.com/Noooste/garage-ui), a modern web interface for managing [Garage](https://garagehq.deuxfleurs.fr/) distributed object storage systems. -[![Version](https://img.shields.io/badge/version-0.6.2-blue.svg)](Chart.yaml) -[![App Version](https://img.shields.io/badge/app%20version-v0.8.3-green.svg)](Chart.yaml) +[![Version](https://img.shields.io/badge/version-0.8.2-blue.svg)](Chart.yaml) +[![App Version](https://img.shields.io/badge/app%20version-v0.8.2-green.svg)](Chart.yaml) ## Table of Contents diff --git a/release-please-config.json b/release-please-config.json index b230a72..6e19585 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -2,26 +2,16 @@ "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", "bump-minor-pre-major": true, "bump-patch-for-minor-pre-major": false, - "separate-pull-requests": false, "packages": { ".": { "release-type": "go", "component": "garage-ui", "include-component-in-tag": false, "changelog-path": "CHANGELOG.md", - "exclude-paths": [ - "helm/garage-ui", - ".github", - "docs", - "scripts" + "extra-files": [ + "helm/garage-ui/Chart.yaml", + "helm/garage-ui/README.md" ] - }, - "helm/garage-ui": { - "release-type": "helm", - "component": "garage-ui-chart", - "package-name": "garage-ui", - "include-component-in-tag": true, - "changelog-path": "CHANGELOG.md" } } }