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

Enable mmap crash workaround more widely (copy #2566) #2567

Merged
merged 4 commits into from
Aug 26, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 24, 2023

This is an automatic copy of pull request #2566 done by Mergify.
Cherry-pick of 60e98a8 has failed:

On branch mergify/copy/1.6/pr-2566
Your branch is up to date with 'origin/1.6'.

You are currently cherry-picking commit 60e98a889.
  (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:   .ci/docker/build-and-publish-docker-image.sh
	both modified:   .ci/gitlab/benchmark.yml
	both modified:   .ci/gitlab/common.yml
	both modified:   .github/workflows/ci.yml
	both modified:   .gitlab-ci.yml

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.com

DigitalBrains1 and others added 4 commits August 24, 2023 16:00
In very specific tests in GitLab CI we are affected by GHC bug #19421.
We can work around the issue by passing `-with-rtsopts=-xm20000000` when
compiling an affected binary. This is a stopgap measure until the real
bug is fixed.

We have seen the bug:
- In `clash-testsuite` in `clashLibTest`s
- In `ffi:example` in the `clash` binary itself
- In `prelude:doctests`, probably in the `doctests` binary itself,
  although this is not certain.

and then only in GHC 9.0.2, although the bug should be in other versions
of GHC as well.

This workaround was applied only to GHC 9.0.2 on CI and only to those
cases that were observed to go wrong, although as a consequence now the
`clash` binary is always built with the RTS option.

The `ffi:example` test should no longer be affected by the GHC bug, but
it is a fairly useless test in its current state as it does not fail
when there are issues, and the tested code is actually faulty. It is
disabled to be fixed later.
PR #2444 added a workaround for GitLab CI, but it is also needed on the
GitHub CI we run for external contributions.
(cherry picked from commit 60e98a8)

# Conflicts:
#	.ci/docker/build-and-publish-docker-image.sh
#	.ci/gitlab/benchmark.yml
#	.ci/gitlab/common.yml
#	.github/workflows/ci.yml
#	.gitlab-ci.yml
We're getting the mmap crash now very regularly on the gitlab runners

(cherry picked from commit 52d85d7)
@leonschoorl
Copy link
Member

I've manually cherry picked #2444 and #2495 into here, because they weren't in 1.6 yet

@martijnbastiaan martijnbastiaan merged commit 7d99af8 into 1.6 Aug 26, 2023
9 checks passed
@martijnbastiaan martijnbastiaan deleted the mergify/copy/1.6/pr-2566 branch August 26, 2023 07:41
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