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

build: fix build environment for the liveness test (backport #10551) #10552

Merged
merged 2 commits into from
Nov 15, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 15, 2021

This is an automatic backport of pull request #10551 done by Mergify.
Cherry-pick of 70a3a90 has failed:

On branch mergify/bp/release/v0.44.x/pr-10551
Your branch is up to date with 'origin/release/v0.44.x'.

You are currently cherry-picking commit 70a3a90f6.
  (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:   .github/workflows/test.yml
	modified:   contrib/images/Makefile
	modified:   contrib/images/simd-env/Dockerfile
	modified:   contrib/images/simd-env/wrapper.sh
	modified:   docker-compose.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

Extracted from #10210.

Make the test more reproducible, so that it does not require coordination
between the build container and the run container.

- Use layers to more advantage.
- Include bash in the run container.
- Put writable output onto a volume.

(cherry picked from commit 70a3a90)

# Conflicts:
#	Makefile
@robert-zaremba robert-zaremba merged commit 3ae5e0c into release/v0.44.x Nov 15, 2021
@robert-zaremba robert-zaremba deleted the mergify/bp/release/v0.44.x/pr-10551 branch November 15, 2021 22:45
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
…0551) (cosmos#10552)

* build: fix build environment for the liveness test (cosmos#10551)

Extracted from cosmos#10210.

Make the test more reproducible, so that it does not require coordination
between the build container and the run container.

- Use layers to more advantage.
- Include bash in the run container.
- Put writable output onto a volume.

(cherry picked from commit 70a3a90)

# Conflicts:
#	Makefile

* fix conflict

Co-authored-by: M. J. Fromberger <[email protected]>
Co-authored-by: Robert Zaremba <[email protected]>
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.

3 participants