ci: add make as a dependency, also use clang-14 for docker builds

ci: add make as a dependency, also use clang-14 for docker builds

Pull Request resolved: #325

5 files changed, 8 insertions, 6 deletions

diff --git a/.github/actions/prepare_vm/action.yaml b/.github/actions/prepare_vm/action.yaml
index 73648611f7..eb8febbac0 100644
--- a/.github/actions/prepare_vm/action.yaml
+++ b/.github/actions/prepare_vm/action.yaml
@@ -24,7 +24,7 @@ runs:
         sudo apt-get update
         sudo apt-get -y install --no-install-recommends \
           python-is-python3 git cmake python3-pip ninja-build antlr3 m4 \
-          clang-14 lld-14 llvm-14 libidn11-dev libaio1 libaio-dev parallel s3cmd
+          clang-14 lld-14 llvm-14 libidn11-dev libaio1 libaio-dev parallel s3cmd make
         sudo pip3 install conan==1.59 pytest==7.1.3 pytest-timeout pytest-xdist==3.3.1 setproctitle==1.3.2 grpcio grpcio-tools PyHamcrest tornado xmltodict pyarrow
     - name: install ccache
       shell: bash
diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile
index 35b02dcf1f..aec6febf8d 100644
--- a/.github/docker/Dockerfile
+++ b/.github/docker/Dockerfile
@@ -8,7 +8,7 @@ ENV TZ=Etc/UTC
 
 RUN apt-get update \
     && apt-get install -y sudo wget gnupg lsb-release curl xz-utils tzdata \
-    cmake python3-pip ninja-build antlr3 m4 clang-12 lld-12 libidn11-dev libaio1 libaio-dev llvm-12 \
+    cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 make \
     && pip3 install conan==1.59 \
     && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \
          tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache)
diff --git a/.github/prewarm/ubuntu-1804.dockerfile b/.github/prewarm/ubuntu-1804.dockerfile
index ac5e7ba86a..950990531f 100644
--- a/.github/prewarm/ubuntu-1804.dockerfile
+++ b/.github/prewarm/ubuntu-1804.dockerfile
@@ -10,11 +10,11 @@ RUN apt-get update \
     && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
     && echo "deb http://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
     && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-12 main" | tee /etc/apt/sources.list.d/llvm.list >/dev/null \
+    && echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" | tee /etc/apt/sources.list.d/llvm.list >/dev/null \
     && apt-get update
 
 
-RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-12 lld-12 libidn11-dev libaio1 libaio-dev llvm-12 \
+RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 make \
     && pip3 install conan==1.59 \
     && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \
      tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache)
diff --git a/.github/prewarm/ubuntu-2004.dockerfile b/.github/prewarm/ubuntu-2004.dockerfile
index 33850c3560..6dadd9d3cf 100644
--- a/.github/prewarm/ubuntu-2004.dockerfile
+++ b/.github/prewarm/ubuntu-2004.dockerfile
@@ -9,10 +9,12 @@ RUN apt-get update \
     && apt-get install -y wget gnupg lsb-release curl xz-utils tzdata \
     && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
     && echo "deb http://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
+    && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+    && echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" | tee /etc/apt/sources.list.d/llvm.list >/dev/null \
     && apt-get update
 
 
-RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-12 lld-12 libidn11-dev libaio1 libaio-dev llvm-12 \
+RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 \
     && pip3 install conan==1.59 \
     && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \
      tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache)
diff --git a/.github/prewarm/ubuntu-2204.dockerfile b/.github/prewarm/ubuntu-2204.dockerfile
index b50beb606d..27ecbc6639 100644
--- a/.github/prewarm/ubuntu-2204.dockerfile
+++ b/.github/prewarm/ubuntu-2204.dockerfile
@@ -8,7 +8,7 @@ ENV TZ=Etc/UTC
 RUN apt-get update && apt-get install -y wget gnupg lsb-release curl xz-utils tzdata
 
 
-RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-12 lld-12 libidn11-dev libaio1 libaio-dev llvm-12 \
+RUN apt-get install -y git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 make \
     && pip3 install conan==1.59 \
     && (V=4.8.1; curl -L https://github.com/ccache/ccache/releases/download/v${V}/ccache-${V}-linux-x86_64.tar.xz | \
      tar -xJ -C /usr/local/bin/ --strip-components=1 --no-same-owner ccache-${V}-linux-x86_64/ccache)