From ca0564084a05e6e96f58c5968528a2dd0cfde11b Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Mon, 17 Jul 2023 22:40:37 -0700 Subject: Switch back to using ghc 9.2 for linux binary releases. This should address the problem noted in #8947. With ghc 9.4+, we were getting AVX instructions in the amd64 binary, which aren't supported on older hardware. For maximum compatibility we switch back to ghc 9.2, which doesn't cause the problem. However, we haven't fully diagnosed the problem, and as documented ghc shouldn't be doing this. Note that this doesn't fix the similar problem for the Windows build (#8955), since that uses stack; we'd need to switch to cabal or use an older version of stackage lts. --- .cirrus.yml | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4de77f0a2..83e2c8ca9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,7 +27,7 @@ task: trigger_type: manual timeout_in: 90m arm_container: - image: glcr.b-data.ch/ghc/ghc-musl:9.6.2 + image: glcr.b-data.ch/ghc/ghc-musl:9.2.8 cpu: 4 memory: 12G env: @@ -53,7 +53,7 @@ task: trigger_type: manual timeout_in: 90m container: - image: glcr.b-data.ch/ghc/ghc-musl:9.6.2 + image: glcr.b-data.ch/ghc/ghc-musl:9.2.8 cpu: 4 memory: 12G env: diff --git a/Makefile b/Makefile index 4f35b6bee..b4f052c62 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ version?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}') pandoc=$(shell find dist -name pandoc -type f -exec ls -t {} \; | head -1) SOURCEFILES?=$(shell git ls-tree -r main --name-only src pandoc-cli pandoc-server pandoc-lua-engine | grep "\.hs$$") PANDOCSOURCEFILES?=$(shell git ls-tree -r main --name-only src | grep "\.hs$$") -DOCKERIMAGE=glcr.b-data.ch/ghc/ghc-musl:9.6.2 +DOCKERIMAGE=glcr.b-data.ch/ghc/ghc-musl:9.2.8 TIMESTAMP=$(shell date "+%Y%m%d_%H%M") LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null)) BASELINE?=$(LATESTBENCH) -- cgit v1.2.3