Skip to content

Commit 1f737ff

Browse files
authored
feat: support clang v19 (#87)
* feat: support clang v19 * fix: sort these package names alphanumerically * feat: add clang v19 to ci.yml
1 parent 72710ca commit 1f737ff

File tree

5 files changed

+31
-10
lines changed

5 files changed

+31
-10
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build:
2424
strategy:
2525
matrix:
26-
target: [ "all", "18", "17", "16", "16-alpine", "15", "14", "13", "12", "11", "10", "9", "8", "7"]
26+
target: [ "all", "19", "18", "17", "16", "16-alpine", "15", "14", "13", "12", "11", "10", "9", "8", "7"]
2727
runs-on: ubuntu-latest
2828
steps:
2929
- uses: actions/checkout@v4

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Please note that by contributing any code or documentation to this repository (b
2222
docker buildx bake --file docker-bake.hcl
2323

2424
# Build specific version of clang-tools docker images
25-
docker buildx bake --file docker-bake.hcl 16
25+
docker buildx bake --file docker-bake.hcl 19
2626

2727
# If want to docker build and push images, add `--push` flag.
28-
docker buildx bake --file docker-bake.hcl --push 16
28+
docker buildx bake --file docker-bake.hcl --push 19
2929
```

Dockerfile.all

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ RUN set -e \
1818
apt-get --no-install-recommends -y install clang-format-$CLANG_VERSION clang-tidy-$CLANG_VERSION; done \
1919
&& rm -rf /var/lib/apt/lists/*
2020

21-
ENV CLANG_VERSIONS="18 17 16 15 14 13"
21+
ENV CLANG_VERSIONS="19 18 17 16 15 14 13"
2222

2323
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2424

2525
RUN set -e \
2626
&& apt-get update \
27-
&& apt-get --no-install-recommends -y install lsb-release wget software-properties-common gnupg \
27+
&& apt-get --no-install-recommends -y install gnupg lsb-release software-properties-common wget \
2828
&& wget --quiet https://apt.llvm.org/llvm.sh \
2929
&& chmod +x llvm.sh \
3030
&& for CLANG_VERSION in $CLANG_VERSIONS; do \
@@ -33,7 +33,7 @@ RUN set -e \
3333
&& rm llvm.sh \
3434
&& rm -rf /var/lib/apt/lists/*
3535

36-
ENV CLANG_VERSIONS="18 17 16 15 14 13 12 11 10 9"
36+
ENV CLANG_VERSIONS="19 18 17 16 15 14 13 12 11 10 9"
3737
# Integrity testing
3838
RUN set -e \
3939
&& for VERSION in $CLANG_VERSIONS; do \

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
[![CI](https://github.com/cpp-linter/clang-tools-docker/actions/workflows/CI.yml/badge.svg)](https://github.com/cpp-linter/clang-tools-docker/actions/workflows/CI.yml)
77
[![Snyk Container](https://github.com/cpp-linter/clang-tools-docker/actions/workflows/snyk-container-analysis.yml/badge.svg)](https://github.com/cpp-linter/clang-tools-docker/actions/workflows/snyk-container-analysis.yml)
88

9-
🐳 The Clang Tools Docker image includes the clang-format and clang-tidy.
9+
🐳 **Clang Tools Docker Image**: This Docker image comes pre-installed with essential clang tools, including `clang-format` and `clang-tidy`.
1010

11-
You can find all the clang-tools Docker images on Docker Hub [registry](https://hub.docker.com/r/xianpengshen/clang-tools) or GitHub Packages [registry](https://github.com/cpp-linter/clang-tools-docker/pkgs/container/clang-tools).
11+
You can access all available Clang Tools Docker images via [Docker Hub registry](https://hub.docker.com/r/xianpengshen/clang-tools) or [GitHub Packages registry](https://github.com/cpp-linter/clang-tools-docker/pkgs/container/clang-tools).
1212

13-
## Supported tags and respective `Dockerfile` links
13+
## Supported Tags and Dockerfile links
1414

15-
* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supported versions of clang-tools includes `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
15+
* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supports versions of clang-tools includes `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
16+
* [`19`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
1617
* [`18`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
1718
* [`17`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
1819
* [`16`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)

docker-bake.hcl

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
group "default" {
33
targets = [
44
"all",
5+
"19",
56
"18",
67
"17",
78
"16",
@@ -41,6 +42,25 @@ target "all" {
4142
platforms = ["linux/amd64"]
4243
}
4344

45+
target "clang-tools" {
46+
matrix = {
47+
tgt = ["19"]
48+
}
49+
name = "${tgt}"
50+
dockerfile = "Dockerfile"
51+
context = "."
52+
args = {
53+
# https://packages.ubuntu.com/search?suite=default&section=all&arch=any&keywords=clang-format-19&searchon=names
54+
BASE_IMAGE="ubuntu:oracular"
55+
CLANG_VERSION="${tgt}",
56+
}
57+
tags = [
58+
"${DOCKER_REPO}:${tgt}",
59+
"${GITHUB_REPO}:${tgt}"
60+
]
61+
platforms = ["linux/amd64"]
62+
}
63+
4464
target "clang-tools" {
4565
matrix = {
4666
tgt = ["18"]

0 commit comments

Comments
 (0)