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

Refactor options fields to use PerCompilerFlavor type #5723

Merged
merged 1 commit into from
Dec 2, 2018

Conversation

phadej
Copy link
Collaborator

@phadej phadej commented Nov 25, 2018

E.g. jaeger-flamegraph.cabal failed to roundtrip 'pretty . parse';

Making the list business work didn't feel right,
so I made a bit bigger refactor.

Summary of the patch:

- options :: [(CompilerFlavor,[String])]
+ options :: PerCompilerFlavor [String]

where

-- | 'PerCompilerFlavor' carries only info per GHC and GHCJS
-- Cabal parses only @ghc-options@ and @ghcjs-options@, others are omitted.
data PerCompilerFlavor v

Please include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Please also shortly describe how you tested your change. Bonus points for added tests!

@phadej phadej requested a review from hvr November 25, 2018 17:59
@phadej
Copy link
Collaborator Author

phadej commented Nov 25, 2018

Does appveyor fails because I changed GPD and tests assume cabal-install used to build project uses the same format as Cabal under test provides (i.e. caches). This is bizarre if it's that way.

haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Nov 25, 2018
"url":"pull/5723",
"account":"haskell",
"repo":"cabal",
"commit": "6fa0a5ff6c94878741700fc5be20690c83f9aadf",
"tag":"linux-7.8.4"
}
haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Nov 25, 2018
"url":"pull/5723",
"account":"haskell",
"repo":"cabal",
"commit": "6fa0a5ff6c94878741700fc5be20690c83f9aadf",
"tag":"linux-7.6.3"
}
haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Nov 25, 2018
"url":"pull/5723",
"account":"haskell",
"repo":"cabal",
"commit": "6fa0a5ff6c94878741700fc5be20690c83f9aadf",
"tag":"linux-7.10.3"
}
@phadej phadej force-pushed the per-compiler-flavor branch 2 times, most recently from df8fc64 to 1b25712 Compare November 25, 2018 21:51
haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Nov 25, 2018
"url":"pull/5723",
"account":"haskell",
"repo":"cabal",
"commit": "6fa0a5ff6c94878741700fc5be20690c83f9aadf",
"tag":"linux-8.2.2"
}
haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Nov 25, 2018
"url":"pull/5723",
"account":"haskell",
"repo":"cabal",
"commit": "6fa0a5ff6c94878741700fc5be20690c83f9aadf",
"tag":"linux-8.0.2"
}
haskell-pushbot pushed a commit to haskell-pushbot/cabal-binaries that referenced this pull request Nov 25, 2018
"url":"pull/5723",
"account":"haskell",
"repo":"cabal",
"commit": "6fa0a5ff6c94878741700fc5be20690c83f9aadf",
"tag":"linux-8.4.4"
}
@phadej
Copy link
Collaborator Author

phadej commented Nov 26, 2018

With this patch hackage-tests roundtrip passes. (we don't run it in the CI as it takes 5+ minutes)

@phadej phadej mentioned this pull request Nov 26, 2018
4 tasks
@phadej phadej force-pushed the per-compiler-flavor branch 2 times, most recently from eb7f36b to bb4f51b Compare November 28, 2018 13:48
E.g. jaeger-flamegraph.cabal failed to roundtrip 'pretty . parse';

Making the list business work didn't feel right,
so I made a bit bigger refactor.
@phadej phadej merged commit dd745a9 into master Dec 2, 2018
@phadej phadej deleted the per-compiler-flavor branch December 2, 2018 16:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant