From f5d7278ee794b81d0ec1d353c2db6449e9b39c7b Mon Sep 17 00:00:00 2001 From: Stephen Nicholas Swatman Date: Fri, 6 Dec 2024 12:38:59 +0100 Subject: [PATCH] Add clang to the main Ubuntu 22.04 machine This commit adds clang to the main Ubuntu 22.04 machine as an optional compiler; with that, the dedicated Ubuntu 22.04 clang machine becomes obsolete. --- .github/workflows/build-images.yml | 1 - {ubuntu2204_clang => archive/ubuntu2204_clang}/Dockerfile | 0 ubuntu2204/Dockerfile | 4 ++++ 3 files changed, 4 insertions(+), 1 deletion(-) rename {ubuntu2204_clang => archive/ubuntu2204_clang}/Dockerfile (100%) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 158e91f..40d5b0a 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -21,7 +21,6 @@ jobs: - ubuntu2204 - ubuntu2204_cuda - ubuntu2204_cuda_oneapi - - ubuntu2204_clang - ubuntu2204_rocm_clang - ubuntu2204_rocm_clang_cxx20 - ubuntu2404 diff --git a/ubuntu2204_clang/Dockerfile b/archive/ubuntu2204_clang/Dockerfile similarity index 100% rename from ubuntu2204_clang/Dockerfile rename to archive/ubuntu2204_clang/Dockerfile diff --git a/ubuntu2204/Dockerfile b/ubuntu2204/Dockerfile index 2a2ecd1..8428c93 100644 --- a/ubuntu2204/Dockerfile +++ b/ubuntu2204/Dockerfile @@ -44,6 +44,7 @@ RUN apt-get update -y \ ccache \ libsqlite3-dev \ time \ + clang \ && apt-get clean -y # manual builds for hep-specific packages @@ -69,3 +70,6 @@ RUN git clone https://github.com/microsoft/onnxruntime src \ --allow_running_as_root \ && cmake --build build/MinSizeRel -- install \ && rm -rf build src + +ENV CC gcc +ENV CXX g++