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

fix: release build scripts (backport #1286) #1373

Merged
merged 3 commits into from
Apr 28, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 28, 2022

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

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

You are currently cherry-picking commit 2029415.
  (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:   .build.sh
	modified:   Makefile
	modified:   contrib/images/Makefile
	modified:   contrib/images/rbuilder/Dockerfile
	new file:   contrib/images/rbuilder/README.md
	modified:   contrib/images/rbuilder/buildlib.sh

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

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

* update all builders

* rbuilder images are prefixed by osmolabs

* update makefile

* use root instead of builder user and other minor changes

* correct lib path in Makefile

* LINK_STATICALLY in Makefile

* docs for builder

* update README

* changelog entry

* remove make clean from .build.sh

* improve readme

* remove spurious whitespace in Makefile

* fix formatting for build-reproducible

* update cosmwasm path in makefile

* copy from /home/builder in build-reproducible

* change wasm file pemissions to non-root

(cherry picked from commit 2029415)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Apr 28, 2022
p0mvn and others added 2 commits April 28, 2022 21:48
* update all builders

* rbuilder images are prefixed by osmolabs

* update makefile

* use root instead of builder user and other minor changes

* correct lib path in Makefile

* LINK_STATICALLY in Makefile

* docs for builder

* update README

* changelog entry

* remove make clean from .build.sh

* improve readme

* remove spurious whitespace in Makefile

* fix formatting for build-reproducible

* update cosmwasm path in makefile

* copy from /home/builder in build-reproducible

* change wasm file pemissions to non-root
@czarcas7ic czarcas7ic requested a review from p0mvn April 28, 2022 21:52
@czarcas7ic czarcas7ic merged commit 445cbc1 into v7.x Apr 28, 2022
@czarcas7ic czarcas7ic deleted the mergify/bp/v7.x/pr-1286 branch April 28, 2022 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants