Skip to content

chore: sync release icm-v0.10.50 into develop#256

Open
pszymkowiak wants to merge 5 commits into
developfrom
chore/back-merge-main-icm-v0.10.50
Open

chore: sync release icm-v0.10.50 into develop#256
pszymkowiak wants to merge 5 commits into
developfrom
chore/back-merge-main-icm-v0.10.50

Conversation

@pszymkowiak
Copy link
Copy Markdown
Contributor

Manual back-merge of release-please commits from main into develop, after the automated Back-merge main into develop job failed on the v0.10.50 release run (run 26327596376, job 77508410900).

Why this is needed

After v0.10.50 was published, the automated back-merge job in cd.yml failed during git push with:

fatal: could not read Username for 'https://github.com': No such device or address
Process completed with exit code 128.

The fast-forward merge itself succeeded — only the push step failed (auth wiring bug between the GitHub App token and git push). Consequence: develop still carries Cargo.toml version 0.10.49 even though main is on 0.10.50, and the next develop → main PR (#248) would otherwise pull a stale base.

What this PR contains

Three release-please artifacts from main, no source changes:

  • .release-please-manifest.json — bump to 0.10.50
  • crates/icm-cli/CHANGELOG.md — 0.10.50 entry
  • crates/icm-cli/Cargo.toml — version 0.10.49 → 0.10.50

No conflict, no behavior change.

Follow-up

The cd.yml back-merge-develop job still needs a durable fix so this doesn't reproduce. Two options:

  1. Switch the bash git push + gh pr create step to peter-evans/create-pull-request@v7, which handles App-token auth correctly.
  2. Keep bash but explicitly inject the App token into the remote URL: git remote set-url origin "https://x-access-token:\${GH_TOKEN}@github.com/\${GITHUB_REPOSITORY}.git" before the push.

Tracked separately — this PR only resolves the immediate drift.

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.

1 participant