Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Build] Upgraded Clang 19 (grpc#38038)
Browse files Browse the repository at this point in the history
This is the second phase of the Clang 19 upgrade, focused on updating the Clang image used in build testing environments.

Closes grpc#38038

PiperOrigin-RevId: 702096087
veblush authored and copybara-github committed Dec 2, 2024
1 parent 721ab4f commit 59691b0
Showing 8 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM silkeh/clang:18-bookworm
FROM silkeh/clang:19-bookworm

RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean
<%include file="../../git_avoid_dubious_ownership_error.include"/>
2 changes: 1 addition & 1 deletion tools/bazelify_tests/dockerimage_current_versions.bzl
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ DOCKERIMAGE_CURRENT_VERSIONS = {
"tools/dockerfile/test/csharp_debian11_arm64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_arm64@sha256:4d4bc5f15e03f3d3d8fd889670ecde2c66a2e4d2dd9db80733c05c1d90c8a248",
"tools/dockerfile/test/csharp_debian11_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/csharp_debian11_x64@sha256:0763d919b17b4cfe5b65aff3bf911c04e9e4d46d11649858742033facd9f534f",
"tools/dockerfile/test/cxx_alpine_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_alpine_x64@sha256:10587bea5d163bf5c34c6157ebd1863d22863d9d38bbaf5135ffc6fbf2b73004",
"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",
"tools/dockerfile/test/cxx_clang_19_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_19_x64@sha256:2b5e396dbb9ef751471eb5c5433cbf3e694616daf0e8f9df53f0933e7796de5d",
"tools/dockerfile/test/cxx_clang_7_x64.current_version": "docker://us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_7_x64@sha256:b35f94648ada85aab9110dae0ebca594cd278672d4bbce38312cefa372952cae",
"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",
"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",
2 changes: 1 addition & 1 deletion tools/bazelify_tests/test/portability_tests.bzl
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ def generate_run_tests_portability_tests(name):
["gcc_12_openssl309", "--cmake_configure_extra_args=-DgRPC_SSL_PROVIDER=package", "tools/dockerfile/test/cxx_debian12_openssl309_x64.current_version"],
["gcc_musl", "", "tools/dockerfile/test/cxx_alpine_x64.current_version"],
["clang_7", "--cmake_configure_extra_args=-DCMAKE_C_COMPILER=clang --cmake_configure_extra_args=-DCMAKE_CXX_COMPILER=clang++", "tools/dockerfile/test/cxx_clang_7_x64.current_version"],
["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"],
["clang_19_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_19_x64.current_version"],
]

for compiler_name, args, docker_image_version in compiler_configs:
1 change: 0 additions & 1 deletion tools/dockerfile/test/cxx_clang_18_x64.current_version

This file was deleted.

1 change: 1 addition & 0 deletions tools/dockerfile/test/cxx_clang_19_x64.current_version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
us-docker.pkg.dev/grpc-testing/testing-images-public/cxx_clang_19_x64:251760b46bd00d63fa042bdb5c5817425d22a5d8@sha256:2b5e396dbb9ef751471eb5c5433cbf3e694616daf0e8f9df53f0933e7796de5d
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM silkeh/clang:18-bookworm
FROM silkeh/clang:19-bookworm

RUN apt update && apt -y upgrade && apt install -y build-essential curl git time wget zip && apt clean
#=================
6 changes: 3 additions & 3 deletions tools/run_tests/run_tests.py
Original file line number Diff line number Diff line change
@@ -598,8 +598,8 @@ def _compiler_options(
return ("alpine", [])
elif compiler == "clang7":
return ("clang_7", self._clang_cmake_configure_extra_args())
elif compiler == "clang18":
return ("clang_18", self._clang_cmake_configure_extra_args())
elif compiler == "clang19":
return ("clang_19", self._clang_cmake_configure_extra_args())
else:
raise Exception("Compiler %s not supported." % compiler)

@@ -1709,7 +1709,7 @@ def _build_and_run(
"gcc14",
"gcc_musl",
"clang7",
"clang18",
"clang19",
# TODO: Automatically populate from supported version
"python3.7",
"python3.8",
2 changes: 1 addition & 1 deletion tools/run_tests/run_tests_matrix.py
Original file line number Diff line number Diff line change
@@ -362,7 +362,7 @@ def _create_portability_test_jobs(
"gcc14",
"gcc_musl",
"clang7",
"clang18",
"clang19",
]:
test_jobs += _generate_jobs(
languages=["c", "c++"],

0 comments on commit 59691b0

Please sign in to comment.