Fix clang-tidy in CI (#1325)

Also removed old docker files and scripts.
XRPLF · Apr 8, 2024 · 7372442 · 7372442
1 parent 36a790d
commit 7372442
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 211 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,8 +39,8 @@ jobs:
 
   build:
     name: Build
-    needs: 
-      - check_format 
+    needs:
+      - check_format
       - check_docs
     strategy:
       fail-fast: false

diff --git a/.github/workflows/update_docker_ci.yml b/.github/workflows/update_docker_ci.yml
@@ -1,5 +1,6 @@
 name: Update CI docker image
 on:
+  pull_request:
   push:
     branches: [develop]
     paths:
@@ -11,9 +12,10 @@ on:
 jobs:
   build_and_push:
     name: Build and push docker image
-    runs-on: ubuntu-20.04
+    runs-on: [self-hosted, heavy]
     steps:
       - name: Login to DockerHub
+        if: ${{ github.event == 'push' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
@@ -36,6 +38,6 @@ jobs:
         with:
           context: ${{ github.workspace }}/docker/ci
           platforms: linux/amd64,linux/arm64
-          push: true
+          push: ${{ github.event == 'push' }}
           tags: ${{ steps.meta.outputs.tags }}
 
diff --git a/docker/centos/Dockerfile b/docker/centos/Dockerfile
diff --git a/docker/centos/build_git_centos7.sh b/docker/centos/build_git_centos7.sh
diff --git a/docker/centos/install_cmake.sh b/docker/centos/install_cmake.sh
diff --git a/docker/ci/dockerfile b/docker/ci/dockerfile
@@ -20,7 +20,7 @@ RUN apt-get -qq update \
 # Install packages
 RUN apt update -qq \
     && apt install -y --no-install-recommends --no-install-suggests python3 python3-pip git git-lfs make ninja-build flex bison jq graphviz \
-    clang-format-${LLVM_TOOLS_VERSION} clang-tidy-${LLVM_TOOLS_VERSION} clang-tools-${LLVM_TOOLS_VERSION} \    
+    clang-format-${LLVM_TOOLS_VERSION} clang-tidy-${LLVM_TOOLS_VERSION} clang-tools-${LLVM_TOOLS_VERSION} \
     && update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-${LLVM_TOOLS_VERSION} 100 \
     && pip3 install -q --upgrade --no-cache-dir pip && pip3 install -q --no-cache-dir conan==1.62 gcovr cmake cmake-format \
     && apt-get clean && apt remove -y software-properties-common
@@ -64,6 +64,11 @@ WORKDIR /root
 # Setup conan
 # Note: intentionally leaving cppstd=20
 RUN conan profile new default --detect \
+    && conan profile update settings.compiler=gcc default \
+    && conan profile update settings.compiler.version=12 default \
     && conan profile update settings.compiler.cppstd=20 default \
     && conan profile update settings.compiler.libcxx=libstdc++11 default \
+    && conan profile update env.CC=/opt/bin/gcc default \
+    && conan profile update env.CXX=/opt/bin/g++ default \
+    && conan profile update "conf.tools.build:compiler_executables={\"c\": \"/opt/bin/gcc\", \"cpp\": \"/opt/bin/g++\"}" default \
     && conan remote add --insert 0 conan-non-prod http://18.143.149.228:8081/artifactory/api/conan/conan-non-prod
diff --git a/docker/clio_docker/centos/build_boost.sh b/docker/clio_docker/centos/build_boost.sh
diff --git a/docker/clio_docker/centos/build_git_centos7.sh b/docker/clio_docker/centos/build_git_centos7.sh
diff --git a/docker/clio_docker/centos/dockerfile b/docker/clio_docker/centos/dockerfile
diff --git a/docker/clio_docker/centos/install_cmake.sh b/docker/clio_docker/centos/install_cmake.sh
diff --git a/docker/compilers/gcc-12/dockerfile b/docker/compilers/gcc-12/dockerfile
@@ -6,7 +6,7 @@ SHELL ["/bin/bash", "-c"]
 USER root
 WORKDIR /root
 
-ENV GCC_VERSION=12.3.0  
+ENV GCC_VERSION=12.3.0
 
 RUN apt update -qq \
     && apt install -qq -y --no-install-recommends --no-install-suggests \

diff --git a/docker/shared/build_boost.sh b/docker/shared/build_boost.sh
diff --git a/docker/shared/install_cmake.sh b/docker/shared/install_cmake.sh
diff --git a/docker/shared/install_openssl.sh b/docker/shared/install_openssl.sh
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile