From 866909b9ecd8b433047c878d1ed004a6cf32c7c2 Mon Sep 17 00:00:00 2001 From: Samuel Maldonado Date: Tue, 30 Jan 2024 11:03:58 -0500 Subject: [PATCH 1/3] add stack_root to environment --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 49ffa6b2..fbc3fc49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: - WORKSPACE=/home/docker/.autotesting - SUPERVISOR_URL=127.0.0.1:9001 - AUTOTESTER_CONFIG=/app/.dockerfiles/docker-config.yml + - STACK_ROOT=/home/docker/.autotesting/.stack depends_on: - postgres - redis From ba98def9830b4c28a8233a43e322e9c96c97ad17 Mon Sep 17 00:00:00 2001 From: Samuel Maldonado Date: Tue, 6 Feb 2024 10:39:42 -0500 Subject: [PATCH 2/3] readme: update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2486b0a7..e1c15815 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,7 @@ Installing each tester will also install the following additional packages (syst - `haskell` - ghc - cabal-install + - haskell-stack - tasty-stats (cabal package) - tasty-discover (cabal package) - tasty-quickcheck (cabal package) From 1e5a192555149e15fd48e227daca518d2e118156 Mon Sep 17 00:00:00 2001 From: Samuel Maldonado Date: Tue, 6 Feb 2024 15:27:09 -0500 Subject: [PATCH 3/3] update changelog and add stack config to readme --- Changelog.md | 1 + README.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Changelog.md b/Changelog.md index 8afd82a2..7dd8874e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented here. ## [unreleased] - Fix bug that prevented copies of instructor directories from being deleted (#483) +- Add STACK_ROOT to containers as well as notes in readme (#484) ## [v2.4.0] - Fix bug that prevented test results from being returned when a feedback file could not be found (#458) diff --git a/README.md b/README.md index e1c15815..f159fe9d 100644 --- a/README.md +++ b/README.md @@ -260,6 +260,10 @@ ERROR_LOG= # file to write error log informatoin to (default is stderr) SETTINGS_JOB_TIMEOUT= # the maximum runtime (in seconds) of a job that updates settings before it is interrupted (default is 60) ``` +## Stack configuration +The Haskell autotester uses [stack](https://docs.haskellstack.org/en/stable/) to install and manage Haskell packages. By default, stack will install to `${HOME}/.stack`, where `${HOME}` is the home directory of the user running the autotester. +The installation location can be configured by setting a `$STACK_ROOT`, such as the root of the workspace directory. + ## MarkUs configuration options After installing the autotester and the API, the next step is to [register the MarkUs instance with the autotester](https://github.com/MarkUsProject/Markus/wiki/Installation#autotester-installation-steps).