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

Read previousVersions for bincompat checking from a file (backport #3202) #3207

Merged
merged 2 commits into from
Apr 26, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2023

This is an automatic backport of pull request #3202 done by Mergify.
Cherry-pick of 2c6028b has failed:

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

You are currently cherry-picking commit 2c6028b03.
  (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 makes it much easier to automate checking new versions as they are
released.

---------

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
(cherry picked from commit 2c6028b)

# Conflicts:
#	build.sbt
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Apr 25, 2023
@mergify mergify bot merged commit 6e5c2bb into 3.6.x Apr 26, 2023
@mergify mergify bot deleted the mergify/bp/3.6.x/pr-3202 branch April 26, 2023 00:41
@sequencer sequencer mentioned this pull request Jun 20, 2023
14 tasks
@jackkoenig jackkoenig added the Internal Internal change, does not affect users, will be included in release notes label Jun 25, 2024
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 Internal Internal change, does not affect users, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant