diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index bec7945..28ba965 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -25,6 +25,10 @@ jobs: steps: - uses: actions/checkout@v4 + - uses: awalsh128/cache-apt-pkgs-action@v1.6.0 + with: + packages: libpcre3-dev + - name: Cache Stack id: cache-stack-unix uses: actions/cache@v4 diff --git a/README.md b/README.md index 1553ba8..411eff0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,6 @@ First, follow the usual Student workflow: Now to simulate the grading process: -1. Install the z3 theorem prover (`sudo apt-get install libz3-dev` or similar) 1. Install [Haskell Stack](https://docs.haskellstack.org/en/stable/#__tabbed_2_1) 1. Optionally set an alias for `stack run -w run.yaml` 1. Execute `stack run -w run.yaml <[submission|solution]>` (`solution` loads a sample solution) diff --git a/run-codeworld-tasks/app/Main.hs b/run-codeworld-tasks/app/Main.hs index 799d005..134b4a7 100644 --- a/run-codeworld-tasks/app/Main.hs +++ b/run-codeworld-tasks/app/Main.hs @@ -89,6 +89,7 @@ runTemplateTask :: String -> String -> IO () runTemplateTask task submission = do tmp <- getTemporaryDirectory grade + id id rejection suggestion diff --git a/run-codeworld-tasks/package.yaml b/run-codeworld-tasks/package.yaml index 1b3dbc1..5c68f64 100644 --- a/run-codeworld-tasks/package.yaml +++ b/run-codeworld-tasks/package.yaml @@ -45,4 +45,3 @@ executables: # used for run-time compilation dependencies - haskell-template-task-raw - codeworld-tasks - - IOTasks diff --git a/run-codeworld-tasks/run-codeworld-tasks.cabal b/run-codeworld-tasks/run-codeworld-tasks.cabal index 4bd9d8d..f7cd16f 100644 --- a/run-codeworld-tasks/run-codeworld-tasks.cabal +++ b/run-codeworld-tasks/run-codeworld-tasks.cabal @@ -29,8 +29,7 @@ executable test-task app ghc-options: -Wall -Werror -Wcompat -Widentities -Wincomplete-uni-patterns -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N build-depends: - IOTasks - , QuickCheck + QuickCheck , base >=4.11 && <5 , codeworld-tasks , directory diff --git a/run.yaml b/run.yaml index faa6c40..efd1680 100644 --- a/run.yaml +++ b/run.yaml @@ -6,17 +6,13 @@ packages: - run-codeworld-tasks extra-deps: - - git: https://github.com/fmidue/IOTasks - commit: 659385853299b4fcb27bd26e7ab185af27a9d00a - - git: https://github.com/IagoAbal/haskell-z3 - commit: b77a17e5eeb7db82656bcbcd66c6e952207e69ca - - git: https://github.com/owestphal/type-match - commit: e1afab43d2e8bfa5e2006492ed34060036e7be51 - git: https://github.com/fmidue/haskell-template-task - commit: 81278a30d63449879c39f403a2cad108ab0785ec + commit: d2f18e228d90f5828aa55d6649448c7eda12c2b7 subdirs: - . - raw - hint-0.9.0.8 - # later versions incompatible with current IO-Tasks - - QuickCheck-2.15.0.1 + +flags: + haskell-template-task-raw: + iotasks: false