Skip to content

tooling: remove tools/Makefile (bp #6102)#6106

Merged
tac0turtle merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-6102
Feb 12, 2021
Merged

tooling: remove tools/Makefile (bp #6102)#6106
tac0turtle merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-6102

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2021

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

Cherry-pick of 2d57043 has failed:

On branch mergify/bp/v0.34.x/pr-6102
Your branch is up to date with 'origin/v0.34.x'.

You are currently cherry-picking commit 2d57043aa.
  (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:   docs/app-dev/abci-cli.md
	modified:   docs/app-dev/getting-started.md
	modified:   docs/introduction/install.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CONTRIBUTING.md
	both modified:   Makefile
	added by us:     tools.mk

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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/

Co-authored-by: Tess Rinearson <tess.rinearson@gmail.com>
(cherry picked from commit 2d57043)

# Conflicts:
#	CONTRIBUTING.md
#	Makefile
#	tools.mk
@tac0turtle tac0turtle merged commit 1b2174a into v0.34.x Feb 12, 2021
@tac0turtle tac0turtle deleted the mergify/bp/v0.34.x/pr-6102 branch February 12, 2021 10:09
tessr added a commit that referenced this pull request Feb 18, 2021
tessr added a commit that referenced this pull request Feb 18, 2021
tessr added a commit that referenced this pull request Feb 23, 2021
This reverts commit afd0709.

I had believed that this tooling change could have been what broke our
GoReleaser flow; I now know that it was a result of changes in Go 1.16
and an update to GoReleaser! GoReleaser has now been updated again
and our flow should be un-broken.
tessr added a commit that referenced this pull request Feb 23, 2021
This reverts commit afd0709.

I had believed that this tooling change could have been what broke our
GoReleaser flow; I now know that it was a result of changes in Go 1.16
and an update to GoReleaser! GoReleaser has now been updated again
and our flow should be un-broken.
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