Skip to content

Commit 3fe9083

Browse files
chore(deps): dependencies 2026-06-29 (#6618)
1 parent 1b6d98c commit 3fe9083

52 files changed

Lines changed: 1021 additions & 672 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

โ€Ž.agents/skills/merge-renovate-prs/SKILL.mdโ€Ž

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,49 @@ gh run view <RUN_ID> --log-failed
140140

141141
Summarize each failure in 1โ€“3 lines. If a failure looks like rate limiting / a transient external dependant (timeouts, 429s, network resets) rather than a code regression, say so and suggest re-running the skill once limits reset.
142142

143+
## Rebasing a stale renovate PR onto the base branch
144+
145+
When a PR's `mergeStateStatus` is `DIRTY` (conflicts) or it's simply behind `chore/renovateBaseBranch`, it needs a rebase before it can go green/merge. **Do NOT** naively `git rebase origin/chore/renovateBaseBranch` and replay every commit on the branch.
146+
147+
Why: Renovate periodically **recreates** `chore/renovateBaseBranch` from `main`, so the base already contains newer-or-equal versions of most bumps the PR branch still carries. The PR branch's older bump commits are stale/superseded (e.g. the base has `@types/node` v26.0.1 while the PR still carries a commit setting it to v26). Replaying them all would try to *downgrade* those deps and manufacture needless `yarn.lock`/`package.json` conflicts.
148+
149+
Correct approach โ€” replay **only the PR's own unique commits** with `git rebase --onto` (this mirrors what Renovate's own "rebase" checkbox does), in a **detached throwaway worktree** so the current branch/working tree is untouched:
150+
151+
```bash
152+
git fetch origin chore/renovateBaseBranch <pr-branch>
153+
# Inspect what's unique to the PR vs the (recreated) base:
154+
git log --oneline origin/chore/renovateBaseBranch..origin/<pr-branch>
155+
```
156+
157+
Identify the commits genuinely unique to this PR โ€” its own dependency bump plus any follow-up (e.g. a "format" commit). Everything below the first unique commit is stale and already on the base in newer form, so drop it. Then:
158+
159+
```bash
160+
WT=/tmp/renovate-rebase-<pr>
161+
git worktree add --detach "$WT" origin/<pr-branch>
162+
cd "$WT"
163+
# <first-unique-commit>^ is the boundary between stale (drop) and unique (keep)
164+
git rebase --onto origin/chore/renovateBaseBranch <first-unique-commit>^
165+
```
166+
167+
- If the replay is clean (usual case), verify `git diff --stat origin/chore/renovateBaseBranch..HEAD` shows **only** the PR's own changes, and that `package.json` and `yarn.lock` reference the same bumped version.
168+
- If a `yarn.lock`/`package.json` conflict appears, resolve per the lockfile rule: take the base's lockfile, keep the PR's version bump in `package.json`, then regenerate the lock (never hand-edit it).
169+
170+
Then force-push with lease and clean up:
171+
172+
```bash
173+
git push --force-with-lease=<pr-branch>:origin/<pr-branch> origin HEAD:<pr-branch>
174+
cd - && git worktree remove --force "$WT"
175+
```
176+
177+
Merge state should flip `DIRTY` โ†’ `UNSTABLE` (conflict resolved, CI running) and a fresh `Checks` run triggers on the new head. This rebase (rewriting a renovate branch's history + force-push) is authorized only when the user explicitly asks to rebase โ€” it's the one exception to "never push to a renovate branch."
178+
179+
Gotcha: never `git worktree remove` the directory you're currently `cd`'d into โ€” deleting the shell's cwd wedges the session. `cd` out first.
180+
143181
## Notes
144182

183+
- **Don't block on the base branch CI or the rebase "storm."** Each merge into `chore/renovateBaseBranch` advances it, which makes Renovate auto-rebase every other open `renovate/*` PR (cancelling their in-flight runs and starting fresh ones) and triggers a run on the base-branchโ†’`main` PR. Do **not** wait for those base-branch runs or for the whole storm to drain. Stay focused on the target PRs: keep retrying their own `check.yml` runs and **merge each the moment its own checks are green**, regardless of what the base branch or other PRs are doing.
184+
- Merges advancing the base will cancel/supersede reruns you started on the other targets โ€” that's expected. Just re-check each target, rerun its failed/cancelled jobs, and merge when green; iterate until the batch is done rather than serializing behind base-branch CI.
145185
- Renovate PRs in this repo target the `chore/renovateBaseBranch` base, not `main` โ€” `gh pr merge` targets each PR's own base automatically, so no special handling is needed.
146186
- Keep CI load low: rerun only failed jobs, never the whole workflow, and never push commits to retrigger unless the user approves.
147187
- Never edit generated client code to "fix" a Renovate failure โ€” these PRs only bump dependencies; a real failure should be surfaced, not patched.
188+
- **Hold bumps that would force a customer-facing runtime bump.** If merging a bump requires raising a *published* client's minimum language/runtime, it's a breaking change for consumers โ€” close the PR with a short explanation instead of migrating (same policy as JUnit 6 โ†’ JVM 17+, pytest-aiohttp โ†’ Py 3.10+). Known case: **`renovate/melos-8.x`** (Dart) โ€” melos โ‰ฅ7 drops `melos.yaml` for Dart pub workspaces, which requires `resolution: workspace` on every package and raises the minimum Dart SDK to 3.5+ on all published packages. Keep the Dart client on **melos 6.x**. (Renovate may recreate a closed PR on its next run; to hold permanently, add the dep to the Renovate config's ignore list.)

โ€Ž.agents/skills/renovate/SKILL.mdโ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ If the PR only updates the `crossScalaVersions` 3.x entry or the 2.x `scalaVersi
147147
Close (do not merge) PRs that update these packages, and add them to the "Abandoned" report list with a note:
148148

149149
- **Dart `json_serializable`**: Updating `json_serializable` requires updating `json_annotation`, which in turn requires bumping the minimum Dart SDK version. This is a breaking change for customers on older Dart versions. Close the PR.
150+
- **Dart `melos` v8+**: melos โ‰ฅ7 drops `melos.yaml` in favor of Dart pub workspaces, which requires `resolution: workspace` on every package and therefore raises the minimum Dart SDK to 3.5+ on all published packages โ€” a breaking change for customers on older Dart versions. Keep the Dart client on melos 6.x. Close the PR.
150151
- **`@redocly/cli` beyond v2.27.0**: v2.27.1 introduces breaking changes (renaming components) that break our spec bundling. Pinned at v2.27.0 for now. Close the PR.
151152
- **Python runtime โ‰ฅ 3.14**: The release toolchain for PyPI (poetry/twine) is not compatible with Python 3.14+. The `python-version` in `clients/algoliasearch-client-python/.github/workflows/release.yml` must stay on the 3.13.x line. If a PR bumps it to 3.14 or above, revert to the latest 3.13.x patch and close the PR.
152153

โ€Ž.github/actions/setup/action.ymlโ€Ž

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ runs:
8585
8686
- name: Cache golangci-lint analysis
8787
if: ${{ inputs.language == 'go' }}
88-
uses: actions/cache@v5
88+
uses: actions/cache@v6
8989
with:
9090
path: ~/.cache/golangci-lint
9191
key: golangci-lint-${{ inputs.version }}-${{ hashFiles('clients/algoliasearch-client-go/go.sum') }}
@@ -99,14 +99,14 @@ runs:
9999

100100
- name: Restore Yarn js-client
101101
if: ${{ inputs.language == 'javascript' }}
102-
uses: actions/cache@v5
102+
uses: actions/cache@v6
103103
with:
104104
path: ${{ steps.yarn-cache-dir-client.outputs.dir || 'clients/algoliasearch-client-javascript/.yarn/cache' }}
105105
key: yarn-cache-clients-${{ hashFiles('clients/algoliasearch-client-javascript/yarn.lock') }}
106106

107107
- name: Cache js-client node modules
108108
if: ${{ inputs.language == 'javascript' }}
109-
uses: actions/cache@v5
109+
uses: actions/cache@v6
110110
with:
111111
path: clients/algoliasearch-client-javascript/node_modules
112112
key: node-modules-clients-${{ hashFiles('clients/algoliasearch-client-javascript/yarn.lock') }}
@@ -184,7 +184,7 @@ runs:
184184
- name: Cache the build folder
185185
id: cache-swift-build
186186
if: ${{ inputs.language == 'swift' }}
187-
uses: actions/cache@v5
187+
uses: actions/cache@v6
188188
with:
189189
path: |
190190
clients/algoliasearch-client-swift/.build
@@ -207,7 +207,7 @@ runs:
207207
- name: Cache the build folder for swiftformat
208208
id: cache-swiftformat
209209
if: ${{ inputs.language == 'swift' }}
210-
uses: actions/cache@v5
210+
uses: actions/cache@v6
211211
with:
212212
path: swiftformat/.build
213213
key: swiftformat-build-${{ steps.swiftformat-version.outputs.SWIFTFORMAT_VERSION }}-${{ runner.os }}

โ€Ž.github/workflows/check.ymlโ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,13 +253,13 @@ jobs:
253253
run: echo "dir=$(cd tests/output/javascript && yarn config get cacheFolder)" >> $GITHUB_OUTPUT
254254

255255
- name: Restore Yarn js tests
256-
uses: actions/cache@v5
256+
uses: actions/cache@v6
257257
with:
258258
path: ${{ steps.yarn-cache-dir-tests.outputs.dir || 'tests/output/javascript/.yarn/cache' }}
259259
key: yarn-cache-tests-${{ hashFiles('tests/output/javascript/yarn.lock') }}
260260

261261
- name: Cache js tests node modules
262-
uses: actions/cache@v5
262+
uses: actions/cache@v6
263263
with:
264264
path: tests/output/javascript/node_modules
265265
key: node-modules-tests-${{ hashFiles('tests/output/javascript/yarn.lock') }}

โ€Ž.github/workflows/push-to-repository.ymlโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
owner: algolia
4040
repositories: ${{ inputs.name }}
4141

42-
- run: yarn workspace scripts pushToRepository ${{ inputs.name }}
42+
- run: yarn workspace scripts pushToRepository ${{ inputs.name }}
4343
env:
4444
GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
4545
GH_TOKEN: ${{ steps.app-token.outputs.token }}

โ€Ž.nvmrcโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.17.0
1+
24.18.0

โ€Žclients/algoliasearch-client-java/build.gradleโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.36.0'
6+
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.37.0'
77
}
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.17.0
1+
24.18.0

โ€Žclients/algoliasearch-client-javascript/package.jsonโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"bundlewatch": "0.4.2",
2121
"execa": "9.6.1",
2222
"lerna": "9.0.7",
23-
"rollup": "4.62.0",
23+
"rollup": "4.62.2",
2424
"typescript": "5.9.3"
2525
},
2626
"bundlewatch": {

โ€Žclients/algoliasearch-client-javascript/packages/abtesting/package.jsonโ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
"@algolia/requester-node-http": "5.55.1"
6161
},
6262
"devDependencies": {
63-
"@arethetypeswrong/cli": "0.18.3",
64-
"@types/node": "25.9.3",
63+
"@arethetypeswrong/cli": "0.18.4",
64+
"@types/node": "25.9.4",
6565
"publint": "0.3.21",
66-
"rollup": "4.62.0",
66+
"rollup": "4.62.2",
6767
"tsup": "8.5.1",
6868
"typescript": "5.9.3"
6969
},

0 commit comments

Comments
ย (0)