From 4ece8d804403dd09b18ce1d5135f5fe0965d7d12 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 2 Nov 2023 11:29:28 -0400 Subject: [PATCH 1/2] README: Note GHC 9.2.6-or-later requirement Fixes #1968. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 53039f491c..0d846bf35c 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,9 @@ To build SAWScript and related utilities from source: to install them: . We recommend Cabal 3.4 or newer, and GHC 8.10, 9.2, or 9.4. + (If you are using the GHC 9.2 series, make sure to use 9.2.6 or later + to avoid [this bug](https://gitlab.haskell.org/ghc/ghc/-/issues/22491).) + * Ensure that you have the C libraries and header files for `terminfo`, which generally comes as part of `ncurses` on most platforms. On Fedora, it is part of the `ncurses-compat-libs` package. From 67a25a81c4f154fd791188494d739274c7f1a236 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 2 Nov 2023 14:58:15 -0400 Subject: [PATCH 2/2] CI: Don't run `poetry update` This causes `poetry` to regenerate the `poetry.lock` file with newer versions of dependencies, which defeats the point of checking in the lock file in the first place. --- .github/workflows/ci.yml | 1 - saw-remote-api/scripts/run_rpc_tests.sh | 1 - saw-remote-api/scripts/test_docker.sh | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d20581719e..d4e42fb846 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -373,7 +373,6 @@ jobs: - name: Install on MacOS test: | cd saw-remote-api/python/ - poetry update poetry install poetry run mypy --install-types --non-interactive saw_client/ || true poetry run mypy --install-types --non-interactive saw_client/ diff --git a/saw-remote-api/scripts/run_rpc_tests.sh b/saw-remote-api/scripts/run_rpc_tests.sh index 7810c71788..d42ca22429 100755 --- a/saw-remote-api/scripts/run_rpc_tests.sh +++ b/saw-remote-api/scripts/run_rpc_tests.sh @@ -13,7 +13,6 @@ function run_test { } echo "Setting up python environment for remote server clients..." -poetry update poetry install echo "Typechecking code with mypy..." diff --git a/saw-remote-api/scripts/test_docker.sh b/saw-remote-api/scripts/test_docker.sh index 5610d6fe5e..f97b6d0c95 100755 --- a/saw-remote-api/scripts/test_docker.sh +++ b/saw-remote-api/scripts/test_docker.sh @@ -38,7 +38,6 @@ sleep 5 # let the server catch its breath and be ready for requests echo "Setting up python environment for remote server clients..."; - poetry update; poetry install; export SAW_SERVER_URL="http://localhost:8080/";