Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Nov 6, 2025

Problem

The version bump PRs increment the xtask crate version. we don't publish that crate so there's no need to increment the version number, and doing so clutters the version bumps.

Solution

Revert xtask version to 0.1.0.


This is an automatic backport of pull request #8950 done by Mergify.

Reason to backport

Backporting this will keep the v3.1 version bumps cleaner, and minimize potential confusion from having a higher version number on this branch than on master

…rate (#8950)

* Update xtask version to 0.1.0 since we will never publish the xtask crate

* Add xtask to the list of crates that should be ignored by scripts/increment-cargo-version.sh

(cherry picked from commit fdecf73)

# Conflicts:
#	ci/xtask/Cargo.lock
#	ci/xtask/Cargo.toml
@mergify mergify bot requested a review from a team as a code owner November 6, 2025 20:54
@mergify mergify bot added the conflicts label Nov 6, 2025
@mergify
Copy link
Author

mergify bot commented Nov 6, 2025

Cherry-pick of fdecf73 has failed:

On branch mergify/bp/v3.1/pr-8950
Your branch is up to date with 'origin/v3.1'.

You are currently cherry-picking commit fdecf73aa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   scripts/increment-cargo-version.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ci/xtask/Cargo.lock
	both modified:   ci/xtask/Cargo.toml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@willhickey willhickey requested a review from a team November 6, 2025 21:07
@codecov-commenter
Copy link

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.2%. Comparing base (db91477) to head (74e43bc).

Additional details and impacted files
@@           Coverage Diff           @@
##             v3.1    #8954   +/-   ##
=======================================
  Coverage    83.2%    83.2%           
=======================================
  Files         864      864           
  Lines      375173   375173           
=======================================
+ Hits       312182   312260   +78     
+ Misses      62991    62913   -78     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@steviez steviez merged commit 9aa699f into v3.1 Nov 11, 2025
41 checks passed
@steviez steviez deleted the mergify/bp/v3.1/pr-8950 branch November 11, 2025 20:43
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.

5 participants