Skip to content

Commit 5c6aebd

Browse files
committed
Update deploy image
1 parent eaa6345 commit 5c6aebd

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ FROM alpine:edge
22

33
RUN apk add --no-cache \
44
curl \
5+
gnupg \
56
gcc \
67
valgrind \
7-
clang19 \
8+
clang22 \
89
compiler-rt \
9-
lld \
10-
llvm \
10+
lld22 \
11+
llvm22 \
1112
libc-dev \
1213
bash \
1314
python3 \

makefile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ SHELL := /bin/bash
44
CC := clang
55
ifeq (${CC}, gcc)
66
GCOV := gcov
7-
else ifeq ($(shell command -v llvm-cov-19 2> /dev/null),)
8-
GCOV := llvm-cov gcov
97
else
10-
GCOV := llvm-cov-19 gcov
8+
GCOV := $(shell command -v llvm-cov-22 2>/dev/null || \
9+
command -v llvm-cov-20 2>/dev/null || \
10+
command -v llvm-cov-19 2>/dev/null || \
11+
echo "llvm-cov") gcov
1112
endif
1213

1314
LIBS = src lib/microcuts/src lib/tools
@@ -80,6 +81,15 @@ docker-img-push:
8081
docker tag clang-wasm:latest aantunes/clang-wasm:latest
8182
docker push aantunes/clang-wasm:latest
8283

84+
.PHONY: container-img-build
85+
container-img-build:
86+
container build -t clang-wasm . --no-cache --platform linux/amd64
87+
88+
.PHONY: container-img-push
89+
container-img-push:
90+
container image tag clang-wasm:latest aantunes/clang-wasm:latest
91+
container image push aantunes/clang-wasm:latest
92+
8393
.PHONY: docker-run-test
8494
docker-run-test:
8595
${DOCKER} ${DOCKER_IMAGE} make test

0 commit comments

Comments
 (0)