Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2.0] Fix CI (backport #2301) #2302

Merged
merged 4 commits into from
Nov 25, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 25, 2024

Had to update the Rust version of the coverage job because one of grcov's dependencies now requires 1.74.
Also cherry-picked #2048


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

(cherry picked from commit 2cc3923)

# Conflicts:
#	.circleci/config.yml
(cherry picked from commit 555cd2c)
(cherry picked from commit 9eef309)

# Conflicts:
#	.circleci/config.yml
Copy link
Contributor Author

mergify bot commented Nov 25, 2024

Cherry-pick of 2cc3923 has failed:

On branch mergify/bp/release/2.0/pr-2301
Your branch is up to date with 'origin/release/2.0'.

You are currently cherry-picking commit 2cc3923c3.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .circleci/config.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 9eef309 has failed:

On branch mergify/bp/release/2.0/pr-2301
Your branch is ahead of 'origin/release/2.0' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9eef30903.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .circleci/config.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

@mergify mergify bot added the conflicts label Nov 25, 2024
@mergify mergify bot mentioned this pull request Nov 25, 2024
@chipshort chipshort changed the title [1.5] Fix CI (backport #2301) [2.0] Fix CI (backport #2301) Nov 25, 2024
@chipshort chipshort enabled auto-merge November 25, 2024 14:47
@chipshort chipshort self-requested a review November 25, 2024 14:47
@chipshort chipshort merged commit 8809517 into release/2.0 Nov 25, 2024
26 of 27 checks passed
@chipshort chipshort deleted the mergify/bp/release/2.0/pr-2301 branch November 25, 2024 14:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant