Skip to content

Conversation

@jiyuzhuang
Copy link
Contributor

@jiyuzhuang jiyuzhuang commented Dec 18, 2025

🔄 Backmerge Incoming!

A backmerge operation is being performed to integrate released packages back into the develop branch. This ensures that the develop branch stays up-to-date with the latest stable releases.

📋 Backmerge Checklist

  • Create new branch from main: chore/backmerge
  • Create Pull Request targeting develop using template gh pr create -B develop --title "🔀 (release) [NO-ISSUE]: Backmerge release into develop" -T .github/pull_request_backmerge_template.md
  • Run pnpm ldmk-tool exit-release
    • Verify that all relevant packages have private: true set in their package.json files
  • fix conflicts with develop branch if needed:
    • ⚠️ NO REBASE! Merge develop into backmerge branch for fixing conflicts
    • Resolve all merge conflicts manually
    • Test resolution locally
  • Complete merge process
  • Create PR in Ledger Live with updated libs:
    • Adapt code if needed (breaking changes)
    • Update all released packages

Copilot AI review requested due to automatic review settings December 18, 2025 16:09
@jiyuzhuang jiyuzhuang requested a review from a team as a code owner December 18, 2025 16:09
@vercel
Copy link

vercel bot commented Dec 18, 2025

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Review Updated (UTC)
device-sdk-ts-sample Ready Ready Preview, Comment Dec 18, 2025 4:12pm
1 Skipped Deployment
Project Deployment Review Updated (UTC)
doc-device-management-kit Ignored Ignored Dec 18, 2025 4:12pm

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR performs a backmerge operation from main to develop following a release. The main purpose is to integrate the released package versions back into the develop branch and ensure packages that were released are marked as private.

Key changes:

  • Updates @ledgerhq/speculos-device-controller from version 0.2.0 to 0.2.1 with updated dependency on @ledgerhq/device-management-kit@^0.13.0
  • Marks 15 released packages as private: true to prevent accidental republishing
  • Updates pnpm-lock.yaml with new dependency resolutions, including updates to @types/node from 22.10.1 to 24.3.0 for certain packages

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
pnpm-lock.yaml Updates dependency resolution for @types/node (22.10.1 → 24.3.0) in specific packages, adds published version of device-management-kit@0.13.0, and updates various transitive dependencies
packages/speculos-device-controller/package.json Bumps version to 0.2.1 and updates device-management-kit dependency from workspace reference to published version ^0.13.0
packages/speculos-device-controller/CHANGELOG.md Adds changelog entry for v0.2.1 patch release
packages/device-management-kit/package.json Sets private flag to true
packages/flipper-plugin-client/package.json Sets private flag to true
packages/mockserver-client/package.json Sets private flag to true
packages/signer/context-module/package.json Sets private flag to true
packages/signer/signer-btc/package.json Sets private flag to true
packages/signer/signer-eth/package.json Sets private flag to true
packages/signer/signer-solana/package.json Sets private flag to true
packages/signer/signer-utils/package.json Sets private flag to true
packages/transport/mockserver/package.json Sets private flag to true
packages/transport/rn-ble/package.json Sets private flag to true
packages/transport/rn-hid/package.json Sets private flag to true
packages/transport/speculos/package.json Sets private flag to true
packages/transport/web-ble/package.json Sets private flag to true
packages/transport/web-hid/package.json Sets private flag to true
packages/trusted-apps/ledger-keyring-protocol/package.json Sets private flag to true
.changeset/cool-towns-relate.md Removes consumed changeset that was published in the release
Files not reviewed (1)
  • pnpm-lock.yaml: Language not supported

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@jiyuzhuang jiyuzhuang added this pull request to the merge queue Jan 5, 2026
Merged via the queue into develop with commit ca637f7 Jan 5, 2026
25 of 59 checks passed
@jiyuzhuang jiyuzhuang deleted the chore/backmerge branch January 5, 2026 08:17
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.

3 participants