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
8 changes: 6 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{
"$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
"$schema": "https://unpkg.com/@changesets/config@4.0.1/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
"ignore": [],
"privatePackages": {
"version": true,
"tag": false
}
}
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,3 @@ updates:
groups:
github-actions:
patterns: ["*"]
ignore:
# v2 needs @changesets/cli v3; drop this when package.json moves to v3.
- dependency-name: changesets/action
update-types: ["version-update:semver-major"]
21 changes: 18 additions & 3 deletions .github/workflows/helm-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ permissions:

jobs:
version-script-smoke:
# The release scripts (update-chart-versions.js, extract-release-notes.js)
# The release scripts (changeset version, update-chart-versions.js, extract-release-notes.js)
# otherwise only run post-merge in release.yml; exercise them at PR time so
# dependency bumps (e.g. js-yaml) can't break chart releases silently.
runs-on: ubuntu-latest
Expand All @@ -29,10 +29,10 @@ jobs:
with:
persist-credentials: false

- name: Setup Node.js 20
- name: Setup Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20
node-version-file: .nvmrc

- name: Enable Corepack
run: corepack enable
Expand All @@ -59,6 +59,21 @@ jobs:
'
git checkout -- charts/*/Chart.yaml

- name: Run the release version script
run: |
# A config or CLI change can make `changeset version` consume changesets without bumping the private root package.
printf -- '---\n"helm-charts": patch\n---\n\nsmoke test\n' > .changeset/version-smoke.md
before=$(node -p 'require("./package.json").version')
yarn run version
after=$(node -p 'require("./package.json").version')
chart=$(sed -n 's/^version: //p' charts/clickstack/Chart.yaml)
if [ "$after" = "$before" ] || [ "$chart" != "$after" ]; then
echo "package.json $before -> $after, Chart.yaml $chart"
exit 1
fi
echo "Version bump OK ($before -> $after)"
git checkout -- .

- name: Run extract-release-notes script
run: |
node scripts/extract-release-notes.js
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,43 +23,43 @@ jobs:
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
fetch-depth: 0
# changesets writes its own ~/.netrc and chart-releaser pushes with CR_TOKEN, so keep the token out of .git/config while yarn runs.
# changesets pushes through the GitHub API and chart-releaser with CR_TOKEN, so keep the token out of .git/config while yarn runs.
persist-credentials: false
- name: Configure Git user
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
- name: Setup Node.js 20
- name: Setup Node.js
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: 20
node-version-file: .nvmrc
- name: Enable Corepack
run: corepack enable
- name: Install Dependencies
run: yarn
- name: Create Release Pull Request
id: changesets
uses: changesets/action@a45c4d594aa4e2c509dc14a9f2b3b67ba3780d0d # v1.9.0
uses: changesets/action@ae32849d5ba541f9ae29e40e22a623bc13562f51 # v2.1.2
with:
commit: 'chore(release): bump version'
title: 'Release ClickStack Helm Charts'
version: yarn run version
publish: yarn run release
commit-message: 'chore(release): bump version'
pr-title: 'Release ClickStack Helm Charts'
version-script: yarn run version
publish-script: yarn run release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Generate release notes from CHANGELOG.md
if: steps.changesets.outputs.hasChangesets == 'false'
if: steps.changesets.outputs.has-changesets == 'false'
run: node scripts/extract-release-notes.js
- name: Run chart-releaser job
if: steps.changesets.outputs.hasChangesets == 'false'
if: steps.changesets.outputs.has-changesets == 'false'
uses: helm/chart-releaser-action@92c6b97fa9f664492a2592e0d1d80bc6bf378957 # v1.9.0
with:
skip_existing: true
config: .github/cr.yaml
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
- name: Push charts to GHCR
if: steps.changesets.outputs.hasChangesets == 'false'
if: steps.changesets.outputs.has-changesets == 'false'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
OCI_REPO: oci://ghcr.io/clickhouse/charts
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,11 @@
"update-chart-versions": "node scripts/update-chart-versions.js"
},
"dependencies": {
"@changesets/cli": "^2.29.4",
"@changesets/cli": "^3.0.3",
"js-yaml": "^5.4.1"
},
"packageManager": "yarn@4.9.2",
"resolutions": {
"tmp@^0.0.33": "^0.2.6"
},
"resolutionsNotes": {
"tmp@^0.0.33": "GHSA-52f5-9888-hmc6 (`<0.2.6`, path traversal via an unsanitized prefix/postfix) and GHSA-898m-9v49-8vgq (`<=0.2.3`). `external-editor` (via @changesets/cli) declares `tmp@^0.0.33`, and a caret on a `0.0.x` version is semver-equivalent to `=0.0.33`, so `yarn up -R` cannot move it -- it needs this override. 0.2.6 is the minimum that clears both advisories; the scanner's suggested 0.2.4 only clears the second. external-editor calls `tmp.tmpNameSync()` and nothing else, which 0.2.x still exports. Reachable only through `yarn changeset`'s interactive editor prompt, never at chart render or release time. Drop once external-editor widens its range."
"engines": {
"node": "^22.11 || ^24 || >=26"
}
}
Loading
Loading