Skip to content

Commit 559eda7

Browse files
nathanchancebhcopeland
authored andcommitted
runtime: docker: Add clang-22
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 0581b30 commit 559eda7

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

support/docker/tuxmake-images.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,45 @@ docker-images-clang_21_all-multiarch:
489489
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "clang_21_all")'
490490

491491

492+
docker-images-clang_22_all-amd64:
493+
stage: build
494+
extends: .docker
495+
variables:
496+
TAG: "-amd64"
497+
script:
498+
- "make publish-clang_22_all"
499+
tags: [saas-linux-medium-amd64]
500+
needs: ['docker-images-base-multiarch']
501+
rules:
502+
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "clang_22_all")'
503+
504+
505+
docker-images-clang_22_all-arm64:
506+
stage: build
507+
extends: .docker
508+
variables:
509+
TAG: "-arm64"
510+
script:
511+
- "make publish-clang_22_all"
512+
tags: [saas-linux-medium-arm64]
513+
needs: ['docker-images-base-multiarch']
514+
rules:
515+
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "clang_22_all")'
516+
517+
518+
docker-images-clang_22_all-multiarch:
519+
stage: publish
520+
extends: .docker
521+
variables:
522+
DOCKER_CLI_EXPERIMENTAL: "enabled"
523+
ARCH_TAGS: "-amd64 -arm64"
524+
script:
525+
- "make publish-multiarch-clang_22_all"
526+
needs: ['docker-images-clang_22_all-amd64', 'docker-images-clang_22_all-arm64']
527+
rules:
528+
- if: '$CI_PIPELINE_SOURCE == "schedule" && ($TUXMAKE_DOCKER_IMAGES == "monthly" || $TUXMAKE_DOCKER_IMAGES == "clang_22_all")'
529+
530+
492531
docker-images-clang_all-amd64:
493532
stage: build
494533
extends: .docker

tuxmake/runtime/docker.ini

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ toolchains =
2525
clang-19,
2626
clang-20,
2727
clang-21,
28+
clang-22,
2829
clang-nightly,
2930
clang-android,
3031
llvm,
@@ -40,6 +41,7 @@ toolchains =
4041
llvm-19,
4142
llvm-20,
4243
llvm-21,
44+
llvm-22,
4345
llvm-nightly,
4446
llvm-android,
4547
rust,
@@ -411,6 +413,18 @@ install_options = -t llvm-toolchain-trixie-21
411413
extra_apt_repo = deb http://apt.llvm.org/trixie llvm-toolchain-trixie-21 main
412414
extra_apt_repo_key = https://apt.llvm.org/llvm-snapshot.gpg.key
413415

416+
[clang-22]
417+
kind = clang-build
418+
base = base-debian13
419+
hosts = amd64, arm64
420+
targets = x86_64, arm64, i386, arm, armv5, mips, powerpc, riscv, s390, loongarch, sparc
421+
rebuild = monthly
422+
packages = clang-22, clang-tidy-22, libclang-rt-22-dev, llvm-22, lld-22,
423+
target_bases = riscv:base-debianunstable, loongarch:base-debianunstable, sparc:base-debianunstable
424+
install_options = -t llvm-toolchain-trixie-22
425+
extra_apt_repo = deb http://apt.llvm.org/trixie llvm-toolchain-trixie-22 main
426+
extra_apt_repo_key = https://apt.llvm.org/llvm-snapshot.gpg.key
427+
414428
[clang-nightly]
415429
kind = clang-build
416430
base = base-debian13

0 commit comments

Comments
 (0)