Merge #2235

2235: Fix extra-source-files not containing files used by TH r=hasufell a=hasufell Co-authored-by: Julian Ospald <julian.ospald@iohk.io> Co-authored-by: Rodney Lorrimar <rodney.lorrimar@iohk.io>
cardano-foundation · Oct 13, 2020 · bc0b803 · bc0b803
2 parents f28289e + 6624d65
commit bc0b803
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/lib/core/README.md b/lib/core/README.md
diff --git a/lib/core/cardano-wallet-core.cabal b/lib/core/cardano-wallet-core.cabal
@@ -9,7 +9,7 @@ copyright:           2018-2020 IOHK
 license:             Apache-2.0
 category:            Web
 build-type:          Simple
-extra-source-files:  README.md
+extra-source-files:  specifications/api/swagger.yaml
 cabal-version:       >=1.10
 
 flag release

diff --git a/lib/core/specifications b/lib/core/specifications
@@ -0,0 +1 @@
+../../specifications
diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
@@ -1540,7 +1540,7 @@ specification =
     unsafeDecode bytes
   where
     bytes = $(
-        let swaggerYaml = "../../specifications/api/swagger.yaml"
+        let swaggerYaml = "./specifications/api/swagger.yaml"
         in liftIO (lookupEnv "SWAGGER_YAML") >>=
         maybe (makeRelativeToProject swaggerYaml) pure >>=
         embedFile

diff --git a/lib/jormungandr/cardano-wallet-jormungandr.cabal b/lib/jormungandr/cardano-wallet-jormungandr.cabal
@@ -10,6 +10,7 @@ license:             Apache-2.0
 category:            Web
 build-type:          Simple
 extra-source-files:  README.md
+                     specifications/api/swagger.yaml
 cabal-version:       >=1.10
 
 flag release

diff --git a/lib/jormungandr/specifications b/lib/jormungandr/specifications
@@ -0,0 +1 @@
+../../specifications
diff --git a/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs b/lib/jormungandr/test/unit/Cardano/Wallet/Jormungandr/ApiSpec.hs
@@ -221,7 +221,7 @@ specification =
     unsafeDecode bytes
   where
     bytes = $(
-        let swaggerYaml = "../../specifications/api/swagger.yaml"
+        let swaggerYaml = "./specifications/api/swagger.yaml"
         in liftIO (lookupEnv "SWAGGER_YAML") >>=
         maybe (makeRelativeToProject swaggerYaml) pure >>=
         embedFile