Skip to content

Commit a374ef3

Browse files
veblushcopybara-github
authored andcommitted
[CI] Updated clang 17 to 18 for c++ tests (grpc#37592)
Closes grpc#37592 PiperOrigin-RevId: 668633593
1 parent 9657acf commit a374ef3

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

templates/tools/dockerfile/test/cxx_clang_17_x64/Dockerfile.template renamed to templates/tools/dockerfile/test/cxx_clang_18_x64/Dockerfile.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
FROM silkeh/clang:17-bookworm
17+
FROM silkeh/clang:18-bookworm
1818

1919
RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean
2020
<%include file="../../git_avoid_dubious_ownership_error.include"/>

tools/bazelify_tests/dockerimage_current_versions.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
9494
"tools/dockerfile/test/csharp_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_arm64@sha256:4d4bc5f15e03f3d3d8fd889670ecde2c66a2e4d2dd9db80733c05c1d90c8a248",
9595
"tools/dockerfile/test/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:0763d919b17b4cfe5b65aff3bf911c04e9e4d46d11649858742033facd9f534f",
9696
"tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004",
97-
"tools/dockerfile/test/cxx_clang_17_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_17_x64@sha256:f4e88cdfe074ee33abbe01f97f945ded0f144693f1eeac4d541a256a7812a21a",
97+
"tools/dockerfile/test/cxx_clang_18_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_18_x64@sha256:46beb9901d0c480a40724a3934677ef5e8d6b2f177517c98e67ccff5d881503f",
9898
"tools/dockerfile/test/cxx_clang_6_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_6_x64@sha256:eebbaf353522d523ec9a7acb34bb3ae194e22ea7493c85c01437719e30da205d",
9999
"tools/dockerfile/test/cxx_debian11_openssl102_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl102_x64@sha256:477ae0da7ff7faa9cf195c0d32472fec4cf8b7325505c63e00b5c794c9a4b1a7",
100100
"tools/dockerfile/test/cxx_debian11_openssl111_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_debian11_openssl111_x64@sha256:d383e66d4a089f9305768e3037faa2a887ff91565b0f3ddd96985dca94e9754f",

tools/bazelify_tests/test/portability_tests.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def generate_run_tests_portability_tests(name):
6262
["gcc_12_openssl309", "--cmake_configure_extra_args=-DgRPC_SSL_PROVIDER=package", "tools/dockerfile/test/cxx_debian12_openssl309_x64.current_version"],
6363
["gcc_musl", "", "tools/dockerfile/test/cxx_alpine_x64.current_version"],
6464
["clang_6", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++", "tools/dockerfile/test/cxx_clang_6_x64.current_version"],
65-
["clang_17_cxx23", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++ --cmake_configure_extra_args=-DCMAKE_CXX_STANDARD=23", "tools/dockerfile/test/cxx_clang_17_x64.current_version"],
65+
["clang_18_cxx23", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++ --cmake_configure_extra_args=-DCMAKE_CXX_STANDARD=23", "tools/dockerfile/test/cxx_clang_18_x64.current_version"],
6666
]
6767

6868
for compiler_name, args, docker_image_version in compiler_configs:

tools/dockerfile/test/cxx_clang_17_x64.current_version

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_18_x64:a3f9bea542d5048a4b0d7fdf91e9253705edb4f2@sha256:46beb9901d0c480a40724a3934677ef5e8d6b2f177517c98e67ccff5d881503f

tools/dockerfile/test/cxx_clang_17_x64/Dockerfile renamed to tools/dockerfile/test/cxx_clang_18_x64/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM silkeh/clang:17-bookworm
15+
FROM silkeh/clang:18-bookworm
1616

1717
RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean
1818
#=================

tools/run_tests/run_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,8 @@ def _compiler_options(
606606
return ("alpine", [])
607607
elif compiler == "clang6":
608608
return ("clang_6", self._clang_cmake_configure_extra_args())
609-
elif compiler == "clang17":
610-
return ("clang_17", self._clang_cmake_configure_extra_args())
609+
elif compiler == "clang18":
610+
return ("clang_18", self._clang_cmake_configure_extra_args())
611611
else:
612612
raise Exception("Compiler %s not supported." % compiler)
613613

@@ -1673,7 +1673,7 @@ def _build_and_run(
16731673
"gcc12_openssl309",
16741674
"gcc_musl",
16751675
"clang6",
1676-
"clang17",
1676+
"clang18",
16771677
# TODO: Automatically populate from supported version
16781678
"python3.7",
16791679
"python3.8",

tools/run_tests/run_tests_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ def _create_portability_test_jobs(
362362
"gcc12_openssl309",
363363
"gcc_musl",
364364
"clang6",
365-
"clang17",
365+
"clang18",
366366
]:
367367
test_jobs += _generate_jobs(
368368
languages=["c", "c++"],

0 commit comments

Comments
 (0)