Skip to content

CI: backport rc1 CD fixes to release-2.6-pool-preview - #7359

Merged
jeremyprime merged 6 commits into
valkey-io:release-2.6-pool-previewfrom
jeremyprime:sync-cd-fixes-to-release
Oct 16, 2026
Merged

jeremyprime merged 6 commits into
valkey-io:release-2.6-pool-previewfrom
jeremyprime:sync-cd-fixes-to-release

Conversation

@jeremyprime

@jeremyprime jeremyprime commented Oct 15, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

Backport the CD fixes merged to main since release-2.6-pool-preview was cut, so the v2.6.0-rc1 CD can be re-dispatched from this branch with the fixes present. These are the fixes for the CD jobs that failed on the initial rc1 cut (Python/Java/npm), plus the follow-up that fixes a shell parse error #7358 introduced in the npm-cd matrix step.

Clean cherry-picks with no conflicts -- the resulting tree is byte-for-byte identical to main, and no non-CD commits are included.

Issue link

This Pull Request backports:

Features / Behaviour Changes

None -- CI-only. No change to shipped artifacts or client behaviour. These fix the rc1 CD jobs so PyPI/Java/npm publish correctly and the npm matrix routes runners (and tests the x86 macOS package) correctly.

Testing

CI-only backport. Each commit was validated on main via its own PR. The cherry-picked branch's tree is identical to main, confirming no drift was introduced in the port.

Checklist

Before submitting the PR make sure the following are checked:

  • This Pull Request is related to one issue.
  • Commit message has a detailed description of what changed and why.
  • Tests are added or updated.
  • CHANGELOG.md and documentation files are updated.
  • Linters have been run (make *-lint targets) and Prettier has been run (make prettier-fix).
  • Destination branch is correct - main or release
  • Create merge commit if merging release branch into main, squash otherwise.
  • Make sure to update the documentation in the valkey-glide-docs repository if necessary

nderraugh and others added 5 commits October 15, 2026 21:46
cibuildwheel 4.3.0 moved the pp311 target to PyPy 8.0 (pp80), which the
manylinux2014 image does not ship, and the rest of the pipeline builds
and tests against PyPy 7.3 (pp73). Pin to <4.3 so all three Python
packages stay on one PyPy ABI.

Fixes valkey-io#7353

Signed-off-by: Neil Derraugh <neil.derraugh@improving.com>
…ey-io#7355)

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>
…alkey-io#7357)

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>
…alkey-io#7356)

* ci(java): cap release-validation benchmark at 100 concurrent tasks

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>

* ci(java): quote concurrentTasks list so all three levels run

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>

---------

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>
…o#7358)

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>
@valkey-review-bot

valkey-review-bot Bot commented Oct 15, 2026 •

Copy link
Copy Markdown
Contributor

Review state

Ready for human review.
Six CD workflow fixes from main, cherry-picked cleanly. The new #7360 commit moves the x86 darwin comment out of the jq program into a bash comment, which fixes the parse error. No matrix.runner references are left, and x86_64-apple-darwin in build-matrix.json does build on macos-15 (CD_RUNNER) and test on macos-15-intel. No findings.

Risk: Low. CI-only changes to the CD workflows. A mistake would fail or misroute a release job on this branch and would not affect shipped client code.

Open findings: none.

Backport: Not needed. The PR targets the release-2.6-pool-preview branch, so it is already a backport of CI-only fixes from main.

Updated for 03b6110 at 2026-10-16 15:56 UTC. The bot rewrites this comment on every review.

@jeremyprime jeremyprime changed the title CI: backport RC1 CD fixes to release-2.6-pool-preview (#7354, #7355, #7356, #7357, #7358) CI: backport rc1 CD fixes to release-2.6-pool-preview (#7354, #7355, #7356, #7357, #7358) Oct 15, 2026
…l parse (valkey-io#7360)

Signed-off-by: Jeremy Parr-Pearson <jeremy.parr-pearson@improving.com>
@jeremyprime jeremyprime changed the title CI: backport rc1 CD fixes to release-2.6-pool-preview (#7354, #7355, #7356, #7357, #7358) CI: backport rc1 CD fixes to release-2.6-pool-preview Oct 16, 2026
@jeremyprime
jeremyprime merged commit 30955c3 into valkey-io:release-2.6-pool-preview Oct 16, 2026
1 of 5 checks passed
@jeremyprime
jeremyprime deleted the sync-cd-fixes-to-release branch October 16, 2026 16:12

This branch is waiting to be deployed

1 waiting deployment
AWS_ACTIONS — 03b6110f Waiting Oct 16, 2026 by jeremyprime via load-platform-matrix #1044
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants