← Back to issue list

chore(merge): 'starbase/main' into 'main'

View original Github issue

Metadata

Project
rockcraft
Number
#1040
Type
pull request
State
merged
Author
tigarmo
Labels
PR: Merge
Created
Updated
Closed

Current evaluation

Merged starbase/main into main via commit 99d1c06a. The maintenance merge was redone after intervening changes and introduced no new commits or functional changes.

Resolution: closed resolved

Reason: PR #1040 was approved and merged into main as commit 99d1c06a. The maintainer confirmed it was redone only to incorporate already-merged changes and contained no new commits or functional changes.

Evaluated by: mr-cal-bot

No scores available.

Issue body

<!-- Describe your changes --> --- - [ ] I've followed the [contribution guidelines](https://github.com/canonical/rockcraft/blob/main/CONTRIBUTING.md). - [ ] I've signed the [CLA](http://www.ubuntu.com/legal/contributors/). - [ ] I've successfully run `make lint && make test`. - [ ] I've added or updated any relevant documentation.

Evaluation history

Date Model Scores Action Summary
stealth/space-bunny-alpha — closed resolved Merged starbase/main into main via commit 99d1c06a. The maintenance merge was redone after intervening changes and introduced no new commits or functional changes.
stealth/space-bunny-alpha — closed resolved Merged into main. The maintainer redid the starbase/main merge after other changes landed, noting that it contained no new commits or functional changes.
qwen/qwen3.6-35b-a3b — — Merged routine branch sync from starbase/main into main. Maintainer tigarmo synced recent changes without new commits or functional updates. CI checks passed and the branch was merged despite a conventional commits policy warning.
qwen3.6-35b-a3b-mtp-q6 — — Merged starbase/main into main to sync accumulated changes. The maintainer performed a fresh merge with no functional changes or new commits, keeping the branch current.

Update history

No update history recorded yet.

Related issues

Issue Project State Summary Similarity
#252 chore(merge): starbase into main craft-archives merged Merged Starbase into main via PR #252 after two approvals; all CI checks passed, with 53 files changed (+2570/-1262).
88%
#30 chore: merge starbase craft-grammar closed Closed unmerged; the starbase integration landed on main via commit 3a6f6c4 (chore(merge): 'starbase' into 'main').
88%
#211 chore(merge): merge/starbase into main craft-grammar merged Merged starbase into main via #211 (commit b95cc0d), changing 33 files (+719/-837); all CI checks passed and two reviewers approved.
88%
#954 chore(merge): 'starbase/main' into 'main' rockcraft merged Merged starbase/main into main via canonical/rockcraft#954; approved by two reviewers with all CI checks passing.
87%
#865 chore(merge): starbase into main rockcraft merged Merged starbase into main via PR #865 (commit 93f70f62); the reported pyright failure was confirmed to pre-exist on clean main.
87%
#6391 chore(merge): merge/starbase into main snapcraft merged Merged Starbase into main via #6391 (commit 12e00aa3a), bringing the latest branch changes for SNAPCRAFT-1361.
86%
#5581 chore(merge): starbase into main snapcraft merged Merged starbase into main as commit 40b9a3523, prepping the 8.10.0 release; approved by 3 reviewers, with remaining red checks (22.04 spread, docs) judged unrelated.
86%
#5419 chore(merge): merge starbase into main snapcraft merged Merged the starbase branch into main via PR #5419 (commit e5752b8b3) for CRAFT-4322. It was an approved routine sync merge; the single failing Ubuntu24.04 spread test was acknowledged as a known 'craft test' issue.
85%
#5750 chore(merge): starbase into main snapcraft merged Merged starbase into main as commit 1669c936b in preparation for Snapcraft 8.12, with approval and no unresolved review comments.
84%
#449 chore(merge): update starbase (2026-09-28) imagecraft merged Merged in #449 via commit 545f51a, rebuilding the Starbase sync on current main and starbase/main and folding dependency, lint, docs, and CI adjustments into one merge.
84%