Skip to content

Use ghc-musl 9.6.2 docker image #8701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgm merged 7 commits into from
Jun 26, 2023
Merged

Use ghc-musl 9.6.2 docker image #8701

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6235056
Use ghc-musl 9.6.1 docker image
benz0li Mar 15, 2023
b9752ff
Merge branch 'main' into build-with-ghc-9.6.1
benz0li Apr 20, 2023
f78109e
Update cirrus.yml to use ghc 9.6.1
benz0li Apr 20, 2023
3c31a3a
Sync Makefile
benz0li Apr 20, 2023
20569fe
Update cirrus.yml to use ghc 9.6.1
benz0li Apr 20, 2023
c3e4bc1
Merge branch 'main' into build-with-ghc-9.6.1
benz0li Jun 26, 2023
ffb6978
Use ghc-musl 9.6.2 docker image
benz0li Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .cirrus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
cpu: 4
memory: 12G
env:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
BASELINE?=$(LATESTBENCH)
Expand Down