clash-lang / clash-compiler

Haskell to VHDL/Verilog/SystemVerilog compiler
https://clash-lang.org/
Other
1.4k stars 149 forks source link

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

Closed mergify[bot] closed 11 months ago

mergify[bot] commented 11 months ago

This is an automatic copy of pull request #2566 done by Mergify. Cherry-pick of 60e98a889ffa55eea98d16ed1736971eae691889 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](https://docs.mergify.com/). 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 ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com
leonschoorl commented 11 months ago

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