aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Benz <[email protected]>2025-04-25 17:04:07 +0200
committerGitHub <[email protected]>2025-04-25 08:04:07 -0700
commita32a9ff7e9683220828e5c86eeb7a6cdde462581 (patch)
treece53746ddb8e7408821e3b956a98ed27e464d30c
parent8864ad0ec0115ea8ac895db9a05b80dd5f553ca4 (diff)
Revert "Use `int-native` subtagged image (#10799)" (#10804)
This reverts commit a14997f92e702fca997e4483b34be30c22025c50.
-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 28219c2ca..7fd27a4cc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -29,7 +29,7 @@ task:
trigger_type: manual
timeout_in: 90m
arm_container:
- image: quay.io/benz0li/ghc-musl:9.8-int-native
+ image: quay.io/benz0li/ghc-musl:9.8
cpu: 4
memory: 12G
env:
@@ -55,7 +55,7 @@ task:
trigger_type: manual
timeout_in: 90m
container:
- image: quay.io/benz0li/ghc-musl:9.8-int-native
+ image: quay.io/benz0li/ghc-musl:9.8
cpu: 4
memory: 12G
env:
diff --git a/Makefile b/Makefile
index 3fa7567a2..7b8de03ef 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ VERSION?=$(shell grep '^[Vv]ersion:' pandoc.cabal | awk '{print $$2;}')
PANDOC_CLI_VERSION?=$(shell grep '^[Vv]ersion:' pandoc-cli/pandoc-cli.cabal | awk '{print $$2;}')
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=quay.io/benz0li/ghc-musl:9.8-int-native
+DOCKERIMAGE=quay.io/benz0li/ghc-musl:9.8
TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
BASELINE?=$(LATESTBENCH)