aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Benz <[email protected]>2023-06-26 18:12:31 +0200
committerGitHub <[email protected]>2023-06-26 09:12:31 -0700
commit7cca27b67d729a360c7faee1d1e80544e31206e4 (patch)
tree4bf4ed92a61012651b35c6325691354ab3576166
parent14f86c348171f44ec0973c3fb0ca30ed182167ac (diff)
Use ghc-musl 9.6.2 docker image (#8701)
-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 24f0889c8..812412f84 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.4.5
+ image: glcr.b-data.ch/ghc/ghc-musl:9.6.2
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.4.5
+ image: glcr.b-data.ch/ghc/ghc-musl:9.6.2
cpu: 4
memory: 12G
env:
diff --git a/Makefile b/Makefile
index ef9a6c785..e0216cd17 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.4.5
+DOCKERIMAGE=glcr.b-data.ch/ghc/ghc-musl:9.6.2
TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
BASELINE?=$(LATESTBENCH)