git.iko.soy/typeable/pandoc
on master help sign in
More Makefile tweaks around docker linux build.
commit27959ba55671018c9100e39911c46097c3fa402f authorJohn MacFarlane <jgm@berkeley.edu> dateFri 5 Mar 2021, 23:59 (6 years ago) parentec98e9c
1 file changed+6−5
Makefile+6−5
Makefile+6−5
@@ -4,15 +4,15 @@ SOURCEFILES?=$(shell git ls-tree -r master --name-only | grep "\.hs$$")
44BRANCH?=master
55ARCH=$(shell uname -m)
66ifeq ($(ARCH),amd64)
7−DOCKERIMAGE=registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4@sha256:83cfc60cb1df984b14d6277946002de6bc7bec25c827f5f9de3b0c5d3aeaa571
8−else ifeq($(ARCH),aarch64)
9−DOCKERIMAGE=registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4@sha256:e54a66cf8ef7f8a60b93f6a51cae7a0bd853a763098ffb3dbda2bf91b7ab49ad
7+ DOCKERIMAGE=registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4@sha256:83cfc60cb1df984b14d6277946002de6bc7bec25c827f5f9de3b0c5d3aeaa571
8+else ifeq ($(ARCH),aarch64)
9+ DOCKERIMAGE=registry.gitlab.b-data.ch/ghc/ghc4pandoc:8.10.4@sha256:e54a66cf8ef7f8a60b93f6a51cae7a0bd853a763098ffb3dbda2bf91b7ab49ad
1010else
11−DOCKERIMAGE=UNSUPPORTEDARCHITECTURE
11+ DOCKERIMAGE=UNSUPPORTEDARCHITECTURE
1212endif
1313COMMIT=$(shell git rev-parse --short HEAD)
1414TIMESTAMP=$(shell date "+%Y%m%d_%H%M")
15−LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv || exit 0))
15+LATESTBENCH=$(word 1,$(shell ls -t bench_*.csv 2>/dev/null))
1616ifeq ($(LATESTBENCH),)
1717BASELINE=
1818else
@@ -91,6 +91,7 @@ debpkg: man/pandoc.1
9191 -v `pwd`/linux/artifacts:/artifacts \
9292 -e REVISION=$(REVISION) \
9393 -w /mnt \
94+ --memory=0 \
9495 --rm \
9596 $(DOCKERIMAGE) \
9697 bash \