From b6aaf3d11064d5c8c59378bb76c4d6dd388e8d85 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 29 Dec 2024 17:29:05 +1100 Subject: [PATCH] .github/workflows/nix.yml: run tests on GHC 9.10 (#1547) * .github/workflows/nix.yml: run tests on GHC 9.10 * test/acceptance.nbconvert.sh: update --- .github/workflows/nix.yml | 3 +-- test/acceptance.nbconvert.sh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 5e7d737c..90950a9e 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -69,7 +69,6 @@ jobs: - name: Check acceptance test for ${{matrix.env}} # Don't bother running it with the display envs since we already run it # with the basic envs, and it doesn't test any display stuff. - # Also disable GHC 9.10 for now - if: ${{ !(contains(matrix.env, fromJSON('"display"')) || contains(matrix.env, fromJSON('"ghc910"'))) }} + if: ${{ !(contains(matrix.env, fromJSON('"display"'))) }} run: | nix build .#checks.x86_64-linux.${{matrix.env}} -L diff --git a/test/acceptance.nbconvert.sh b/test/acceptance.nbconvert.sh index 4a423ffc..cdc00496 100755 --- a/test/acceptance.nbconvert.sh +++ b/test/acceptance.nbconvert.sh @@ -33,8 +33,8 @@ $* --to=notebook --execute --allow-errors test/acceptance.nbconvert.in.ipynb mv test/acceptance.nbconvert.in.nbconvert.ipynb test/acceptance.nbconvert.out.ipynb diff \ - <(grep -v -e 'version' -e 'Line ' -e 'Integral' -e 'Num' -e 'error' \ + <(grep -v -e 'version' -e 'Line ' -e 'Integral' -e 'Num' -e 'Real' -e 'error' \ <(cat test/acceptance.nbconvert.in.ipynb | jq '{"cells": .cells | map(del(.metadata.execution)), "metadata": .metadata}')) \ - <(grep -v -e 'version' -e 'Line ' -e 'Integral' -e 'Num' -e 'error' \ + <(grep -v -e 'version' -e 'Line ' -e 'Integral' -e 'Num' -e 'Real' -e 'error' \ <(cat test/acceptance.nbconvert.out.ipynb | jq '{"cells": .cells | map(del(.metadata.execution)), "metadata": .metadata}'))