From 14c76220f526a5d3c01f5ad4be05e60a4f4eeb4d Mon Sep 17 00:00:00 2001 From: Swarnim Arun Date: Tue, 27 Jun 2023 16:36:59 +0530 Subject: [PATCH 1/2] chore: move to `LLVM-16` --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63bb28b..1f14311 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,13 +10,14 @@ RUN apt-get update \ && apt-get install -y git cmake build-essential byacc libpcre3 libpcre3-dev grep lsb-release wget software-properties-common gnupg libcurl4-openssl-dev unzip lcov --no-install-recommends # skipcq: DOK-DL3018 # Get LLVM -ARG LLVM_VER=15 +ARG LLVM_VER=16 RUN wget --no-verbose https://apt.llvm.org/llvm.sh RUN chmod +x ./llvm.sh \ && ./llvm.sh ${LLVM_VER} \ && apt-get -y install libclang-${LLVM_VER}-dev libclang-cpp${LLVM_VER}-dev --no-install-recommends \ && apt-get clean \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && ln -s /usr/lib/x86_64-linux-gnu/libclang-16.so.16.0.6 /usr/lib/x86_64-linux-gnu/libclang-16.so.16 # Add environment variables for build ENV PATH="$PATH:/usr/lib/llvm-${LLVM_VER}/bin" From a26e054a857169111a7cfd876789b6656f0a0b97 Mon Sep 17 00:00:00 2001 From: Deepak Raj H R <104898724+deepak-deepsource@users.noreply.github.com> Date: Tue, 27 Jun 2023 22:52:42 +0530 Subject: [PATCH 2/2] Use docker not kaniko Signed-off-by: Deepak Raj H R <104898724+deepak-deepsource@users.noreply.github.com> --- cloudbuild_depl_dev.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cloudbuild_depl_dev.yaml b/cloudbuild_depl_dev.yaml index d6ccb7d..7f725a1 100644 --- a/cloudbuild_depl_dev.yaml +++ b/cloudbuild_depl_dev.yaml @@ -1,13 +1,13 @@ timeout: 30m0s steps: -- name: 'gcr.io/kaniko-project/executor:v1.0.0' +- name: 'gcr.io/cloud-builders/docker' args: - - --destination=us.gcr.io/deepsource-dev/cppcheck-deepsource:dev - - --dockerfile=Dockerfile - - --cache=true - - --cache-ttl=24h - - --snapshotMode=redo + - build + - --tag=us.gcr.io/deepsource-dev/cppcheck-deepsource:dev + - . + +images: ['us.gcr.io/deepsource-dev/cppcheck-deepsource:dev'] options: machineType: 'E2_HIGHCPU_8'