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

Add Scala 2.13.11 and 2.12.18 to plugin cross versions (backport #3327) #3328

Merged
merged 2 commits into from
Jun 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 6, 2023

This is an automatic backport of pull request #3327 done by Mergify.
Cherry-pick of b22c3ba has failed:

On branch mergify/bp/3.5.x/pr-3327
Your branch is up to date with 'origin/3.5.x'.

You are currently cherry-picking commit b22c3ba2c.
  (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:   build.sbt

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This enables Chisel users to use these newer Scala versions.

(cherry picked from commit b22c3ba)

# Conflicts:
#	build.sbt
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Jun 6, 2023
@mergify mergify bot merged commit f5ea92a into 3.5.x Jun 6, 2023
@mergify mergify bot deleted the mergify/bp/3.5.x/pr-3327 branch June 6, 2023 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant