aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <[email protected]>2023-07-16 09:37:13 -0700
committerJohn MacFarlane <[email protected]>2023-07-16 09:37:13 -0700
commitfb5bcb4345d3d242ac13892f713c5c3fda4d82a7 (patch)
tree572ea96b4693c1134b93cf68672d1f34bd60f90c
parentc7c7da3f923b85f7e35ed6634004ff813d0e6889 (diff)
Revert to ghc-musl-9.4.4.ghc944-3.1.5ghc942-3.1.5
For background see #8947.
-rw-r--r--.cirrus.yml4
-rw-r--r--Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 812412f84..ebcf31e81 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.4.4
cpu: 4
memory: 12G
env:
@@ -52,7 +52,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.4.4
cpu: 4
memory: 12G
env:
diff --git a/Makefile b/Makefile
index 4f35b6bee..421cf2b6d 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.4.4
TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
BASELINE?=$(LATESTBENCH)