From 5ca5ea196aa44356965380e2224da36c120bf599 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Tue, 3 Feb 2026 18:32:08 +0100 Subject: [PATCH 1/3] simplify offline tool with haskell-template-task flag --- README.md | 1 - run-codeworld-tasks/package.yaml | 1 - run.yaml | 14 +++++--------- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 01772fb..dbc594b 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 examples/configs/ ` 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.yaml b/run.yaml index faa6c40..a32f1a2 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: c04b00d681b4fc364eb073f21c51c2b075fc0065 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 From 3c939d830e5cf58735b8e73947ecc9f1831da302 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Tue, 14 Apr 2026 13:14:13 +0200 Subject: [PATCH 2/3] update commit and adjust interface --- run-codeworld-tasks/app/Main.hs | 1 + run-codeworld-tasks/run-codeworld-tasks.cabal | 3 +-- run.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run-codeworld-tasks/app/Main.hs b/run-codeworld-tasks/app/Main.hs index 263a845..7f1f4bd 100644 --- a/run-codeworld-tasks/app/Main.hs +++ b/run-codeworld-tasks/app/Main.hs @@ -69,6 +69,7 @@ runTemplateTask :: String -> String -> IO () runTemplateTask task submission = do tmp <- getTemporaryDirectory grade + id id rejection suggestion 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 a32f1a2..efd1680 100644 --- a/run.yaml +++ b/run.yaml @@ -7,7 +7,7 @@ packages: extra-deps: - git: https://github.com/fmidue/haskell-template-task - commit: c04b00d681b4fc364eb073f21c51c2b075fc0065 + commit: d2f18e228d90f5828aa55d6649448c7eda12c2b7 subdirs: - . - raw From 669ffc3e5944d56078ac50b486fd0a3b24ec8dc3 Mon Sep 17 00:00:00 2001 From: patritzenfeld Date: Tue, 14 Apr 2026 13:24:01 +0200 Subject: [PATCH 3/3] install regex lib --- .github/workflows/haskell.yml | 4 ++++ 1 file changed, 4 insertions(+) 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