Skip to content

Commit 22e3b29

Browse files
authored
Merge branch 'master' into add-arm-builds
2 parents 72f27ea + f67f8ee commit 22e3b29

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
strategy:
4242
matrix:
4343
target: ${{ fromJson(needs.extract-targets.outputs.targets) }}
44+
runs-on: ubuntu-latest
4445
steps:
4546
- uses: actions/checkout@v4
4647

@@ -59,8 +60,7 @@ jobs:
5960
run: docker buildx bake --file docker-bake.hcl --print
6061

6162
- name: Build image for tag ${{ matrix.target }}
62-
if: github.ref == 'refs/heads/master'
63-
run: docker buildx bake --file docker-bake.hcl ${{ matrix.target }} --load
63+
run: docker buildx bake --file docker-bake.hcl ${{ matrix.target }}
6464

6565
- name: Publish image for tag ${{ matrix.target }}
6666
if: github.ref == 'refs/heads/master' && github.event_name == 'workflow_dispatch'

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ You can access all available Clang Tools Docker images via [Docker Hub registry
1414

1515
* [`all`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.all) (Supports versions of clang-tools includes `20`, `19`, `18`, `17`, `16`, `15`, `14`, `13`, `12`, `11`, `10`, `9`)
1616
* [`20`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
17+
* [`20-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
1718
* [`19`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
19+
* [`19-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
1820
* [`18`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
21+
* [`18-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
1922
* [`17`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
23+
* [`17-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
2024
* [`16`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)
2125
* [`16-alpine`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile.alpine)
2226
* [`15`](https://github.com/cpp-linter/clang-tools-docker/blob/master/Dockerfile)

docker-bake.hcl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ target "all" {
222222
"${GITHUB_REPO}:all"
223223
]
224224
platforms = ["linux/amd64", "linux/arm64"]
225+
output = ["type=registry"]
225226
}
226227

227228
target "clang-tools" {
@@ -241,6 +242,7 @@ target "clang-tools" {
241242
"${GITHUB_REPO}:${tgt}"
242243
]
243244
platforms = ["linux/amd64", "linux/arm64"]
245+
output = ["type=registry"]
244246
}
245247

246248
target "clang-tools" {
@@ -260,6 +262,7 @@ target "clang-tools" {
260262
"${GITHUB_REPO}:${tgt}"
261263
]
262264
platforms = ["linux/amd64", "linux/arm64"]
265+
output = ["type=registry"]
263266
}
264267

265268
target "clang-tools" {
@@ -279,6 +282,7 @@ target "clang-tools" {
279282
"${GITHUB_REPO}:${tgt}"
280283
]
281284
platforms = ["linux/amd64", "linux/arm64"]
285+
output = ["type=registry"]
282286
}
283287

284288
target "clang-tools" {
@@ -297,6 +301,7 @@ target "clang-tools" {
297301
"${GITHUB_REPO}:${tgt}"
298302
]
299303
platforms = ["linux/amd64", "linux/arm64"]
304+
output = ["type=registry"]
300305
}
301306

302307
target "clang-tools" {
@@ -315,6 +320,7 @@ target "clang-tools" {
315320
"${GITHUB_REPO}:${tgt}"
316321
]
317322
platforms = ["linux/amd64", "linux/arm64"]
323+
output = ["type=registry"]
318324
}
319325

320326
target "clang-tools" {
@@ -333,11 +339,12 @@ target "clang-tools" {
333339
"${GITHUB_REPO}:${tgt}"
334340
]
335341
platforms = ["linux/amd64", "linux/arm64"]
342+
output = ["type=registry"]
336343
}
337344

338345
target "clang-tools" {
339346
matrix = {
340-
tgt = ["16-alpine"]
347+
tgt = ["16-alpine", "17-alpine", "18-alpine", "19-alpine", "20-alpine"]
341348
}
342349
name = "${tgt}"
343350
dockerfile = "Dockerfile.alpine"
@@ -350,5 +357,6 @@ target "clang-tools" {
350357
"${DOCKER_REPO}:${tgt}",
351358
"${GITHUB_REPO}:${tgt}"
352359
]
353-
platforms = ["linux/amd64"]
360+
platforms = ["linux/amd64", "linux/arm64"]
361+
output = ["type=registry"]
354362
}

0 commit comments

Comments
 (0)