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

Support asm/cmm/js sources in executable components (#8639) (backport #9061) #9130

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 16, 2023

This is an automatic backport of pull request #9061 done by Mergify.
Cherry-pick of 3350a6c has failed:

On branch mergify/bp/3.10/pr-9061
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit 3350a6c8a.
  (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:
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/cabal.out
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/cabal.project
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/cabal.test.hs
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/cbits/HeapPrim.cmm
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/cmmexperiment.cabal
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/demo/Main.hs
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/setup.out
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/setup.test.hs
	new file:   cabal-testsuite/PackageTests/CmmSourcesExe/src/Demo.hs
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/cabal.project
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/demo/Main.hs
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/js-arch.test.hs
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/jsbits/lib.js
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/jssources-exe.cabal
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.out
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/other-arch.test.hs
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/src/Lib.hs
	new file:   cabal-testsuite/PackageTests/JS/JsSourcesExe/srcJS/Lib.hs
	new file:   changelog.d/issue-8639

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/Simple/GHC.hs

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

* WIP support asm/cmm/js sources in executable components (#8639)

* Factorise extra src code for lib/exe and add extra exe src tests

* Add extra sources to linking step

* lint

* lint

* Don't build js sources for executables on non-js hosts

* Fix cabal.out for CmmSourcesExe test and lint

* Update changelog

* Slight changes

(cherry picked from commit 3350a6c)

# Conflicts:
#	Cabal/src/Distribution/Simple/GHC.hs
@Mikolaj
Copy link
Member

Mikolaj commented Sep 20, 2023

Since we are just releasing 3.10.2.0, let me close this backport in the light of #9061 (comment).

@Mikolaj Mikolaj closed this Sep 20, 2023
@mergify mergify bot deleted the mergify/bp/3.10/pr-9061 branch September 20, 2023 20:26
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