Skip to content

chore(nix-tests): update rust version (backport #2546) #2582

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
May 28, 2024
Merged

chore(nix-tests): update rust version (backport #2546) #2582

merged 3 commits into from
May 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 28, 2024

Description

Closes: #XXXX

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • tackled an existing issue or discussed with a team member
  • left instructions on how to review the changes
  • targeted the correct branch (see PR Targeting)

Reviewers Checklist

All items are required.
Please add a note if the item is not applicable
and please add your handle next to the items reviewed
if you only reviewed selected items.

I have...

  • added a relevant changelog entry to the Unreleased section in CHANGELOG.md
  • confirmed all author checklist items have been addressed
  • confirmed that this PR does not change production code
  • reviewed content
  • tested instructions (if applicable)
  • confirmed all CI checks have passed
This is an automatic backport of pull request #2546 done by [Mergify](https://mergify.com).

@GAtom22 @mergify
chore(nix-tests): update rust version (#2546)
dfda731 
chore(e2e-tests): update rust version

(cherry picked from commit bed85aa)

# Conflicts:
#	nix/default.nix
@mergify Mergify
Copy link
Contributor Author

mergify bot commented May 28, 2024

Cherry-pick of bed85aa has failed:

On branch mergify/bp/release/v18.0.x/pr-2546
Your branch is up to date with 'origin/release/v18.0.x'.

You are currently cherry-picking commit bed85aa0.
  (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:   nix/hermes.nix

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   nix/default.nix

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 requested a review from a team as a code owner May 28, 2024 14:19
@mergify mergify bot added the conflicts label May 28, 2024
@mergify mergify bot requested review from facs95 and GAtom22 May 28, 2024 14:19
@mergify mergify bot mentioned this pull request May 28, 2024
Merged
9 tasks
@Vvaradinov Vvaradinov enabled auto-merge (squash) May 28, 2024 14:31
@Vvaradinov Vvaradinov merged commit 2c40b09 into release/v18.0.x May 28, 2024
@Vvaradinov Vvaradinov deleted the mergify/bp/release/v18.0.x/pr-2546 branch May 28, 2024 14:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GAtom22 GAtom22 Awaiting requested review from GAtom22 GAtom22 is a code owner automatically assigned from evmos/core-engineering

2 more reviewers

@Vvaradinov Vvaradinov Vvaradinov approved these changes

@facs95 facs95 facs95 approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Vvaradinov @facs95 @GAtom22