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

feat: local dev environment (backport #1554) #1654

Merged
merged 3 commits into from
Jun 2, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2022

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

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

You are currently cherry-picking commit f5472e0.
  (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:   Dockerfile
	new file:   tests/localosmosis/Dockerfile
	new file:   tests/localosmosis/README.md
	new file:   tests/localosmosis/docker-compose.yml
	new file:   tests/localosmosis/keys.sh
	new file:   tests/localosmosis/setup.sh

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   Makefile

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

* localosmosis

* extract docker runs to script

* change ubuntu to alpine

* nicco suggestions

* update changelog

(cherry picked from commit f5472e0)

# Conflicts:
#	CHANGELOG.md
#	Makefile
@mergify mergify bot added the conflicts label Jun 2, 2022
czarcas7ic and others added 2 commits June 2, 2022 14:35
* localosmosis

* extract docker runs to script

* change ubuntu to alpine

* nicco suggestions

* update changelog
@codecov-commenter
Copy link

codecov-commenter commented Jun 2, 2022

Codecov Report

Merging #1654 (8ccf9c7) into v8.x (dbeac2c) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             v8.x    #1654   +/-   ##
=======================================
  Coverage   20.66%   20.66%           
=======================================
  Files         204      204           
  Lines       25993    25993           
=======================================
  Hits         5372     5372           
  Misses      19639    19639           
  Partials      982      982           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update dbeac2c...8ccf9c7. Read the comment docs.

@czarcas7ic czarcas7ic merged commit 6e6e8a1 into v8.x Jun 2, 2022
@czarcas7ic czarcas7ic deleted the mergify/bp/v8.x/pr-1554 branch June 2, 2022 19:44
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.

2 participants