diff --git a/Guide/testing.markdown b/Guide/testing.markdown
index 3a5fbde78..746b6d03f 100644
--- a/Guide/testing.markdown
+++ b/Guide/testing.markdown
@@ -24,6 +24,7 @@ The following setup and tests can be viewed in the [Blog example](https://github
```haskell
# Test/Main.hs
+
module Main where
import Test.Hspec
@@ -128,6 +129,12 @@ package flags have changed, resetting and loading new packages...
Loaded GHCi configuration from /home/amitaibu/Sites/Haskell/ihp/blog/.ghci
```
+Another way of executing the tests, that we'll use on CI, is to use the `runghc` command, while running `devenv up` on another tab:
+
+```
+nix-shell --run "runghc $(make print-ghc-extensions) -i. -ibuild -iConfig Test/Main.hs"
+```
+
## Setting the Current User During Testing
Use `withUser` to call an action with a specific user during testing:
@@ -293,3 +300,65 @@ tests = aroundAll (withIHPApp WebApplication config) do
## Advanced
For more details on how to structure test suites see the [Hspec manual](http://hspec.github.io/) (a Haskell testing library). You also might want to check out the cool [Hedgehog](https://hedgehog.qa/) library for automated property tests.
+
+## GitHub Actions
+
+The following GitHub Action workflow can be used to run the tests on CI:
+
+```yaml
+# .github/workflows/test.yml
+
+name: Test
+
+# Controls when the workflow will run
+on:
+ # Triggers the workflow on push or pull request events but only for the main branch
+ push:
+ branches: [ main ]
+ pull_request:
+ branches: [ main ]
+
+ # Allows you to run this workflow manually from the Actions tab
+ workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+ tests:
+ name: Run Tests
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: cachix/install-nix-action@v20
+ with:
+ nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/51bcdc4cdaac48535dabf0ad4642a66774c609ed.tar.gz
+
+ # Use the cachix cache for faster builds.
+ - name: Cachix Init
+ uses: cachix/cachix-action@v12
+ with:
+ name: digitallyinduced
+ skipPush: true
+
+ # Install devenv.
+ - uses: cachix/cachix-action@v12
+ with:
+ name: devenv
+ - name: Install devenv.sh
+ run: nix profile install github:cachix/devenv/latest
+ shell: sh
+
+ # Install direnv, which also `direnv allow`s the project.
+ - uses: HatsuneMiku3939/direnv-action@v1
+ with:
+ direnvVersion: 2.32.3
+
+ - run: |
+ # Build generated files.
+ nix-shell --run "make build/Generated/Types.hs"
+
+ # Start the project in the background.
+ nix-shell --run "devenv up &"
+
+ # Execute the tests.
+ nix-shell --run "runghc $(make print-ghc-extensions) -i. -ibuild -iConfig Test/Main.hs"
+```
diff --git a/IHP/RouterSupport.hs b/IHP/RouterSupport.hs
index 0a35bc64a..2e88ea0be 100644
--- a/IHP/RouterSupport.hs
+++ b/IHP/RouterSupport.hs
@@ -644,7 +644,7 @@ instance {-# OVERLAPPABLE #-} (Show controller, AutoRoute controller) => HasPath
-- | Parses the HTTP Method from the request and returns it.
getMethod :: (?context :: RequestContext) => Parser StdMethod
getMethod =
- case parseMethod ?context.request.requestMethod of
+ case parseMethod ?context.request.requestMethod of
Left error -> fail (ByteString.unpack error)
Right method -> pure method
{-# INLINABLE getMethod #-}
@@ -968,6 +968,5 @@ routeParam paramName =
--
-- >
Show project
--
--- See https://forum.ihpapp.com/ShowThread?threadId=ad73d6a5-2481-4e2f-af46-9bf8849f998b
-- See https://github.com/digitallyinduced/ihp/issues/840
instance ((T.TypeError (T.Text "Looks like you forgot to pass a " :<>: (T.ShowType argument) :<>: T.Text " to this " :<>: (T.ShowType controller))), Data argument, Data controller, Data (argument -> controller)) => AutoRoute (argument -> controller) where
diff --git a/IHP/SchemaCompiler.hs b/IHP/SchemaCompiler.hs
index 55efdc4bc..8bcff36fd 100644
--- a/IHP/SchemaCompiler.hs
+++ b/IHP/SchemaCompiler.hs
@@ -450,7 +450,7 @@ findForeignKeyConstraint CreateTable { name } column =
compileEnumDataDefinitions :: (?schema :: Schema) => Statement -> Text
compileEnumDataDefinitions CreateEnumType { values = [] } = "" -- Ignore enums without any values
compileEnumDataDefinitions enum@(CreateEnumType { name, values }) =
- "data " <> modelName <> " = " <> (intercalate " | " valueConstructors) <> " deriving (Eq, Show, Read, Enum)\n"
+ "data " <> modelName <> " = " <> (intercalate " | " valueConstructors) <> " deriving (Eq, Show, Read, Enum, Bounded)\n"
<> "instance FromField " <> modelName <> " where\n"
<> indent (unlines (map compileFromFieldInstanceForValue values))
<> " fromField field (Just value) = returnError ConversionFailed field (\"Unexpected value for enum value. Got: \" <> Data.String.Conversions.cs value)\n"
diff --git a/README.md b/README.md
index d0d89308b..66a463077 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,12 @@
-
-
+
+
-
+
@@ -157,7 +157,7 @@ There's more on the IHP website.
Questions, or need help with haskell type errors? [Join our Slack Community](https://ihp.digitallyinduced.com/Slack)
-[Also check out the IHP Forum!](https://forum.ihpapp.com/)
+[Also check out the IHP Forum!](https://discuss.ihp.digitallyinduced.com/)
## Contributing
diff --git a/flake-module.nix b/flake-module.nix
index 50a14e208..5cdd568e5 100644
--- a/flake-module.nix
+++ b/flake-module.nix
@@ -59,6 +59,14 @@ ihpFlake:
type = lib.types.path;
};
+ withHoogle = lib.mkOption {
+ description = ''
+ Enable Hoogle support. Adds `hoogle` command to PATH.
+ '';
+ type = lib.types.bool;
+ default = false;
+ };
+
dontCheckPackages = lib.mkOption {
description = ''
List of Haskell package names whose tests are skipped during build.
@@ -166,7 +174,9 @@ ihpFlake:
containers = lib.mkForce {};
languages.haskell.enable = true;
- languages.haskell.package = ghcCompiler.ghc.withPackages cfg.haskellPackages;
+ languages.haskell.package = (if cfg.withHoogle
+ then ghcCompiler.ghc.withHoogle
+ else ghcCompiler.ghc.withPackages) cfg.haskellPackages;
languages.haskell.languageServer = ghcCompiler.haskell-language-server;
languages.haskell.stack = null; # Stack is not used in IHP
diff --git a/flake.lock b/flake.lock
index e20c5f638..70270fc75 100644
--- a/flake.lock
+++ b/flake.lock
@@ -488,17 +488,17 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1694477507,
- "narHash": "sha256-RtUmM5s6vnx1W+tnrGzXArVScJ/IoGmqCLM177k5O5A=",
- "owner": "NixOS",
+ "lastModified": 1696172942,
+ "narHash": "sha256-hKlB5InxJjDxLy5NJ4tQKEJ39Om81H87uoo0HHBG2UU=",
+ "owner": "mpscholten",
"repo": "nixpkgs",
- "rev": "ff303118b2ec262eb342eab88ae79318fac66d52",
+ "rev": "3cdb4f45a50eb2a6a1a65f324e8243cedef4b19c",
"type": "github"
},
"original": {
- "owner": "NixOS",
+ "owner": "mpscholten",
+ "ref": "fix-ghc-m1-issue",
"repo": "nixpkgs",
- "rev": "ff303118b2ec262eb342eab88ae79318fac66d52",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
index 8e3bed93b..54e7a02a2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
inputs = {
# TODO use nixpkgs-unstable and just .lock a version?
- nixpkgs.url = "github:NixOS/nixpkgs?rev=ff303118b2ec262eb342eab88ae79318fac66d52";
+ nixpkgs.url = "github:mpscholten/nixpkgs/fix-ghc-m1-issue";
# pre-defined set of default target systems
systems.url = "github:nix-systems/default";
diff --git a/ihp-hsx/ihp-hsx.cabal b/ihp-hsx/ihp-hsx.cabal
index 382ac4f9a..c5a98594d 100644
--- a/ihp-hsx/ihp-hsx.cabal
+++ b/ihp-hsx/ihp-hsx.cabal
@@ -19,15 +19,15 @@ source-repository head
library
default-language: Haskell2010
build-depends:
- base >= 4.16.3 && < 4.17
- , blaze-html >= 0.9.1 && < 0.10
- , bytestring >= 0.11.3 && < 0.12
- , template-haskell >= 2.18.0 && < 2.19
- , text >= 1.2.5 && < 1.3
- , containers >= 0.6.5 && < 0.7
- , blaze-markup >= 0.8.2 && < 0.9
- , ghc >= 9.2.4 && < 9.3
- , megaparsec >= 9.2.1 && < 9.3
+ base >= 4.17.0 && < 4.18
+ , blaze-html >= 0.9.1 && < 0.10
+ , bytestring >= 0.11.3 && < 0.12
+ , template-haskell >= 2.19.0 && < 2.20
+ , text >= 2.0.1 && < 2.1
+ , containers >= 0.6.6 && < 0.7
+ , blaze-markup >= 0.8.2 && < 0.9
+ , ghc >= 9.4.4 && < 9.5
+ , megaparsec >= 9.2.2 && < 9.3
, string-conversions >= 0.4.0 && < 0.5
default-extensions:
OverloadedStrings