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

Hack around wrong .mix directories for tests (backport #7493) #7570

Merged
merged 9 commits into from
Aug 24, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 23, 2021

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

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

You are currently cherry-picking commit 2917995d0.
  (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:   cabal-install/cabal-install.cabal

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.io/

@Mikolaj
Copy link
Member

Mikolaj commented Aug 23, 2021

The backport will fail, because test outputs are changed by other commits, but I will fixup the backport PR.

@Mikolaj Mikolaj force-pushed the mergify/bp/3.6/pr-7493 branch from ea5776d to 014de93 Compare August 24, 2021 08:48
@Mikolaj Mikolaj merged commit f4f4ee0 into 3.6 Aug 24, 2021
@mergify mergify bot deleted the mergify/bp/3.6/pr-7493 branch August 24, 2021 11:43
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