From 95f27514ae81e7a1e8a80460087f45a0f38fec73 Mon Sep 17 00:00:00 2001 From: Ahmed AbouZaid <6760103+aabouzaid@users.noreply.github.com> Date: Thu, 23 Jan 2025 19:25:33 +0100 Subject: [PATCH 1/2] split release prs --- .../.release-please-manifest.json | 2 +- .../release-please/release-please-config.json | 53 ++++--------------- .github/workflows/chart-release-pr.yml | 4 +- .../workflows/chart-release-update-config.yml | 50 ----------------- charts/camunda-platform-alpha/Chart.yaml | 2 +- 5 files changed, 14 insertions(+), 97 deletions(-) delete mode 100644 .github/workflows/chart-release-update-config.yml diff --git a/.github/config/release-please/.release-please-manifest.json b/.github/config/release-please/.release-please-manifest.json index e73a8a3e7e..5b9bcb4891 100644 --- a/.github/config/release-please/.release-please-manifest.json +++ b/.github/config/release-please/.release-please-manifest.json @@ -3,5 +3,5 @@ "charts/camunda-platform-8.4": "9.4.6", "charts/camunda-platform-8.5": "10.4.8", "charts/camunda-platform-8.6": "11.1.1", - "charts/camunda-platform-alpha": "8.7.0-alpha2" + "charts/camunda-platform-alpha": "12.0.0-alpha3" } diff --git a/.github/config/release-please/release-please-config.json b/.github/config/release-please/release-please-config.json index 55b072062e..f9a672424e 100644 --- a/.github/config/release-please/release-please-config.json +++ b/.github/config/release-please/release-please-config.json @@ -1,32 +1,36 @@ { - "group-pull-request-title-pattern": "chore(release): Camunda Platform Helm Chart", "skip-github-release": true, - "separate-pull-requests": false, + "separate-pull-requests": true, "bump-minor-pre-major": false, - "prerelease": false, "draft": false, "bootstrap-sha": "bddfa98ced4aead3212b2a22e872fd0406da4590", "last-release-sha": "bddfa98ced4aead3212b2a22e872fd0406da4590", "packages": { "charts/camunda-platform-alpha": { + "pull-request-title-pattern": "chore(release): Camunda Platform Helm Chart ${version} - Camunda Alpha", "release-type": "helm", - "extra-label": "version/alpha,version/8.7,automation/release-please,release/pr,kind/chore,chart/camunda-platform", + "versioning": "prerelease", + "extra-label": "version/8.7,version/alpha,automation/release-please,release/pr,kind/chore,chart/camunda-platform", "component": "camunda-platform-alpha", "include-v-in-tag": false }, "charts/camunda-platform-8.6": { + "pull-request-title-pattern": "chore(release): Camunda Platform Helm Chart ${version} - Camunda 8.6", "release-type": "helm", "extra-label": "version/8.6,automation/release-please,release/pr,kind/chore,chart/camunda-platform", "component": "camunda-platform-8.6", - "include-v-in-tag": false + "include-v-in-tag": false, + "packageName": "camunda-platform" }, "charts/camunda-platform-8.5": { + "pull-request-title-pattern": "chore(release): Camunda Platform Helm Chart ${version} - Camunda 8.5", "release-type": "helm", "extra-label": "version/8.5,automation/release-please,release/pr,kind/chore,chart/camunda-platform", "component": "camunda-platform-8.5", "include-v-in-tag": false }, "charts/camunda-platform-8.4": { + "pull-request-title-pattern": "chore(release): Camunda Platform Helm Chart ${version} - Camunda 8.4", "release-type": "helm", "extra-label": "version/8.4,automation/release-please,release/pr,kind/chore,chart/camunda-platform", "component": "camunda-platform-8.4", @@ -40,6 +44,7 @@ ] }, "charts/camunda-platform-8.3": { + "pull-request-title-pattern": "chore(release): Camunda Platform Helm Chart ${version} - Camunda 8.3", "release-type": "helm", "extra-label": "version/8.3,automation/release-please,release/pr,kind/chore,chart/camunda-platform", "component": "camunda-platform-8.3", @@ -51,44 +56,6 @@ "jsonpath": "$.version" } ] - }, - "charts/camunda-platform-8.2": { - "release-type": "helm", - "extra-label": "version/8.2,automation/release-please,release/pr,kind/chore,chart/camunda-platform", - "component": "camunda-platform-8.2", - "include-v-in-tag": false, - "extra-files": [ - { - "type": "yaml", - "path": "charts/identity/Chart.yaml", - "jsonpath": "$.version" - }, - { - "type": "yaml", - "path": "charts/operate/Chart.yaml", - "jsonpath": "$.version" - }, - { - "type": "yaml", - "path": "charts/optimize/Chart.yaml", - "jsonpath": "$.version" - }, - { - "type": "yaml", - "path": "charts/tasklist/Chart.yaml", - "jsonpath": "$.version" - }, - { - "type": "yaml", - "path": "charts/zeebe/Chart.yaml", - "jsonpath": "$.version" - }, - { - "type": "yaml", - "path": "charts/zeebe-gateway/Chart.yaml", - "jsonpath": "$.version" - } - ] } }, "changelog-sections": [ diff --git a/.github/workflows/chart-release-pr.yml b/.github/workflows/chart-release-pr.yml index 861258ba32..ffd1e6aeb5 100644 --- a/.github/workflows/chart-release-pr.yml +++ b/.github/workflows/chart-release-pr.yml @@ -3,7 +3,7 @@ name: "Chart - Release - PR" on: push: branches: - - main + - distro-378-aa-refactor-release-workflow permissions: contents: write @@ -30,4 +30,4 @@ jobs: # Config docs: https://github.com/googleapis/release-please/blob/main/docs/manifest-releaser.md config-file: "${{ env.RELEASE_PLEASE_CONFIG_FILE }}" manifest-file: "${{ env.RELEASE_PLEASE_MANIFEST_FILE }}" - # target-branch: "release-candidate" + target-branch: "${{ github.ref_name }}" diff --git a/.github/workflows/chart-release-update-config.yml b/.github/workflows/chart-release-update-config.yml deleted file mode 100644 index be8ad23ad4..0000000000 --- a/.github/workflows/chart-release-update-config.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: "Chart - Release - Update Config" - -on: - push: - branches: - - main - paths: - - .github/config/release-please/.release-please-manifest.json - workflow_dispatch: { } - -permissions: - contents: write - -env: - RELEASE_PLEASE_CONFIG_FILE: ".github/config/release-please/release-please-config.json" - -jobs: - # A workaround for https://github.com/googleapis/release-please/issues/2202 - update-config: - name: Update release-please config - runs-on: ubuntu-latest - steps: - - name: Generate GitHub token - uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2 - id: generate-github-token - with: - app_id: ${{ secrets.GH_APP_ID_DISTRO_CI }} - private_key: ${{ secrets.GH_APP_PRIVATE_KEY_DISTRO_CI }} - - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - with: - fetch-depth: 0 - token: ${{ steps.generate-github-token.outputs.token }} - - name: Configure Git - run: | - git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - - name: Get latest release commit - run: | - last_release_commit="$(git log -n1 --pretty=format:'%H' --grep='chore(release):')" - cat "${RELEASE_PLEASE_CONFIG_FILE}" | - jq --arg last_release_commit "${last_release_commit}" \ - '(."last-release-sha", ."bootstrap-sha") = $last_release_commit' | tee "${RELEASE_PLEASE_CONFIG_FILE}" - - name: Git pull - run: git pull --rebase --autostash . - - uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4 - with: - author_name: "distro-ci[bot]" - author_email: "122795778+distro-ci[bot]@users.noreply.github.com" - message: "chore(release): update release-please config" diff --git a/charts/camunda-platform-alpha/Chart.yaml b/charts/camunda-platform-alpha/Chart.yaml index 6c4bbf90e5..7298c3c3dc 100644 --- a/charts/camunda-platform-alpha/Chart.yaml +++ b/charts/camunda-platform-alpha/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: camunda-platform -version: 8.7.0-alpha3 +version: 12.0.0-alpha3 appVersion: 8.7.x description: | Camunda 8 Self-Managed Helm charts. From f642a105c2202f174943347ee9dba544a5de006f Mon Sep 17 00:00:00 2001 From: "distro-ci[bot]" <122795778+distro-ci[bot]@users.noreply.github.com> Date: Fri, 24 Jan 2025 08:19:41 +0000 Subject: [PATCH 2/2] chore(release): Camunda Platform Helm Chart 12.0.0-alpha4 - Camunda Alpha --- .../.release-please-manifest.json | 2 +- charts/camunda-platform-alpha/CHANGELOG.md | 18 ++++++++++++++++++ charts/camunda-platform-alpha/Chart.yaml | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 charts/camunda-platform-alpha/CHANGELOG.md diff --git a/.github/config/release-please/.release-please-manifest.json b/.github/config/release-please/.release-please-manifest.json index 5b9bcb4891..d3d18822e6 100644 --- a/.github/config/release-please/.release-please-manifest.json +++ b/.github/config/release-please/.release-please-manifest.json @@ -3,5 +3,5 @@ "charts/camunda-platform-8.4": "9.4.6", "charts/camunda-platform-8.5": "10.4.8", "charts/camunda-platform-8.6": "11.1.1", - "charts/camunda-platform-alpha": "12.0.0-alpha3" + "charts/camunda-platform-alpha": "12.0.0-alpha4" } diff --git a/charts/camunda-platform-alpha/CHANGELOG.md b/charts/camunda-platform-alpha/CHANGELOG.md new file mode 100644 index 0000000000..b39ca310e9 --- /dev/null +++ b/charts/camunda-platform-alpha/CHANGELOG.md @@ -0,0 +1,18 @@ +# Changelog + +## [12.0.0-alpha4](https://github.com/camunda/camunda-platform-helm/compare/camunda-platform-alpha-v12.0.0-alpha3...camunda-platform-alpha-12.0.0-alpha4) (2025-01-24) + + +### Features + +* configure web-modeler restapi JWK Set URI ([#2704](https://github.com/camunda/camunda-platform-helm/issues/2704)) ([0be3045](https://github.com/camunda/camunda-platform-helm/commit/0be304587c72c25644f08e3520089065eff55a8a)) + + +### Bug Fixes + +* added support for optimize env vars for migration initcontainer ([#2710](https://github.com/camunda/camunda-platform-helm/issues/2710)) ([8fc1265](https://github.com/camunda/camunda-platform-helm/commit/8fc1265feba2e9ab5b2d386b53e54e6e0cea47b5)) + + +### Refactors + +* switch 8.7 to 8.6 chart structure ([#2790](https://github.com/camunda/camunda-platform-helm/issues/2790)) ([24e9c1a](https://github.com/camunda/camunda-platform-helm/commit/24e9c1a2d57025dcd08a14fb2a324c4af4cdcbac)) diff --git a/charts/camunda-platform-alpha/Chart.yaml b/charts/camunda-platform-alpha/Chart.yaml index 7298c3c3dc..12567c167f 100644 --- a/charts/camunda-platform-alpha/Chart.yaml +++ b/charts/camunda-platform-alpha/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: camunda-platform -version: 12.0.0-alpha3 +version: 12.0.0-alpha4 appVersion: 8.7.x description: | Camunda 8 Self-Managed Helm charts.