Skip to content

chore: back-merge main → develop (adopt cobra 1.10.2 + reconcile drift) - #340

Merged
saadqbal merged 3 commits into
developfrom
chore/back-merge-main-cobra
Jul 16, 2026
Merged

chore: back-merge main → develop (adopt cobra 1.10.2 + reconcile drift)#340
saadqbal merged 3 commits into
developfrom
chore/back-merge-main-cobra

Conversation

@saadqbal

@saadqbalsaadqbal commented Jul 16, 2026

Copy link
Copy Markdown
Collaborator

Why (release prep)

develop is 11 commits ahead of main (the v0.9.3 payload), but main was 2 ahead of develop: the cobra 1.10.2 bump (#334) landed on main only (pre-#336, when Dependabot still targeted main), so develop was stuck on cobra 1.8.1. Promoting develop→main as-is would conflict on go.mod/go.sum and risk reverting cobra on main.

This back-merges main → develop so develop adopts cobra 1.10.2 before the promote — the durable drift fix (#336 already points future bumps at develop).

Resolution

Merge this first; then the develop→main promote is clean.

🤖 Generated with Claude Code


Note

Low Risk
Dependency-only change with no application code edits; cobra is the CLI framework and the bump is a minor version alignment already validated on main.

Overview
Back-merges the main-only cobra bump into develop so branch promotion does not fight over go.mod/go.sum or roll develop back to cobra 1.8.1.

The only functional change in the diff is bumping github.com/spf13/cobra from v1.8.1 to v1.10.2 in go.mod, with go.sum updated to match (including refreshed indirect entries such as go-md2man/v2). Other direct deps (e.g. progressbar v3.19.1) stay as on develop. No CLI or command-tree source files are modified in this PR.

Reviewed by Cursor Bugbot for commit 4fa3d8d. Bugbot is set up for automated code reviews on this repo. Configure here.

dependabotBotand others added 3 commits July 15, 2026 13:02
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.8.1 to 1.10.2.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.8.1...v1.10.2)
---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
dependency-version: 1.10.2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.8.1 to 1.10.2.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.8.1...v1.10.2)
---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
dependency-version: 1.10.2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Asad Iqbal (Saadi) <asad.dsoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@LukasWodka

Copy link
Copy Markdown
Contributor

👋 Heads-up — Code review queue is at 38 / 30

Above the WIP limit. The team convention is to review existing PRs before opening new work.

Open PRs currently in Code review (oldest first):

Pull from review before opening new work. (This is a nudge from the kanban WIP check, not a block.)

@saadqbal
saadqbal merged commit 44b50b1 into developJul 16, 2026
23 checks passed
@saadqbal
saadqbal deleted the chore/back-merge-main-cobra branch July 16, 2026 08:30
saadqbal added a commit that referenced this pull request Jul 16, 2026
* chore(deps): bump softprops/action-gh-release from 2 to 3
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 2 to 3.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@v2...v3)
---
updated-dependencies:
- dependency-name: softprops/action-gh-release
dependency-version: '3'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* chore: back-merge main → develop after #323 promote (#335)
* chore(deps): bump the k8s group with 3 updates (#331)
Bumps the k8s group with 3 updates: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) and [k8s.io/client-go](https://github.com/kubernetes/client-go).
Updates `k8s.io/api` from 0.36.1 to 0.36.2
- [Commits](kubernetes/api@v0.36.1...v0.36.2)
Updates `k8s.io/apimachinery` from 0.36.1 to 0.36.2
- [Commits](kubernetes/apimachinery@v0.36.1...v0.36.2)
Updates `k8s.io/client-go` from 0.36.1 to 0.36.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.36.1...v0.36.2)
---
updated-dependencies:
- dependency-name: k8s.io/api
dependency-version: 0.36.2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: k8s
- dependency-name: k8s.io/apimachinery
dependency-version: 0.36.2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: k8s
- dependency-name: k8s.io/client-go
dependency-version: 0.36.2
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: k8s
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Asad Iqbal (Saadi) <asad.dsoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/schollz/progressbar/v3 (#333)
Bumps [github.com/schollz/progressbar/v3](https://github.com/schollz/progressbar) from 3.19.0 to 3.19.1.
- [Release notes](https://github.com/schollz/progressbar/releases)
- [Commits](schollz/progressbar@v3.19.0...v3.19.1)
---
updated-dependencies:
- dependency-name: github.com/schollz/progressbar/v3
dependency-version: 3.19.1
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Asad Iqbal (Saadi) <asad.dsoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump helm/kind-action from 1.10.0 to 1.14.0 (#328)
Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.10.0 to 1.14.0.
- [Release notes](https://github.com/helm/kind-action/releases)
- [Commits](helm/kind-action@v1.10.0...v1.14.0)
---
updated-dependencies:
- dependency-name: helm/kind-action
dependency-version: 1.14.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Asad Iqbal (Saadi) <asad.dsoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump actions/add-to-project from 1.0.2 to 2.0.0 (#327)
Bumps [actions/add-to-project](https://github.com/actions/add-to-project) from 1.0.2 to 2.0.0.
- [Release notes](https://github.com/actions/add-to-project/releases)
- [Commits](actions/add-to-project@v1.0.2...v2.0.0)
---
updated-dependencies:
- dependency-name: actions/add-to-project
dependency-version: 2.0.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Asad Iqbal (Saadi) <asad.dsoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump actions/stale from 9 to 10 (#332)
Bumps [actions/stale](https://github.com/actions/stale) from 9 to 10.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](actions/stale@v9...v10)
---
updated-dependencies:
- dependency-name: actions/stale
dependency-version: '10'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Asad Iqbal (Saadi) <asad.dsoft@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(ci): point Dependabot at develop, not main (#336)
All work in this repo flows feature → develop → main (promote PRs).
Dependabot defaults to the repo default branch (main), so the first
batch of bumps (#327#334) targeted main directly — bypassing develop
and set to regress on the next promote (develop carries the older deps).
Set target-branch: "develop" on both ecosystems so bumps ride the normal
review + promote path.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
* ci: bump artifact actions to v7 (upload + download together) (#337)
Supersedes Dependabot #329, which bumped actions/upload-artifact 4→7 but
left actions/download-artifact@v4 in release.yml's publish job. GitHub
requires matching upload/download majors — a v7↔v4 pair breaks the
release artifact merge (download-artifact can't read v7-format uploads).
Bump all four refs together: upload-artifact in build.yml, mutation.yml,
release.yml, and download-artifact in release.yml. CI/release-only; no
CLI-binary change.
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
* Merge pull request #339 from tracebloc/fix/338-heartbeat-single-client
fix(cli): home heartbeat fetches one client, not the whole account (#338)
* chore(deps): bump github.com/spf13/cobra from 1.8.1 to 1.10.2 (#340)
Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.8.1 to 1.10.2.
- [Release notes](https://github.com/spf13/cobra/releases)
- [Commits](spf13/cobra@v1.8.1...v1.10.2)
---
updated-dependencies:
- dependency-name: github.com/spf13/cobra
dependency-version: 1.10.2
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
Sign up for freeto 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.

3 participants

@saadqbal@LukasWodka@aptracebloc