diff --git a/.ci/build-kit/docker/Dockerfile b/.ci/build-kit/docker/Dockerfile index aa438f23b..ca655b11d 100644 --- a/.ci/build-kit/docker/Dockerfile +++ b/.ci/build-kit/docker/Dockerfile @@ -1,13 +1,3 @@ # syntax=docker/dockerfile:1 ARG BASE_IMAGE_TAG=latest FROM ghcr.io/everest/everest-ci/build-kit-base:${BASE_IMAGE_TAG} - -# Local update for everest-cmake -ENV EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake -# renovate: datasource=github-releases depName=EVerest/everest-cmake versioning=loose -ENV EVEREST_CMAKE_VERSION=4d81814 -RUN rm -rf ${EVEREST_CMAKE_PATH} -RUN git clone https://github.com/EVerest/everest-cmake.git ${EVEREST_CMAKE_PATH} \ - && cd ${EVEREST_CMAKE_PATH} \ - && git checkout ${EVEREST_CMAKE_VERSION} \ - && rm -r .git diff --git a/.ci/build-kit/scripts/compile.sh b/.ci/build-kit/scripts/compile.sh index ea63ff6e7..a2d5c5e89 100755 --- a/.ci/build-kit/scripts/compile.sh +++ b/.ci/build-kit/scripts/compile.sh @@ -2,6 +2,14 @@ set -e + +EVEREST_CMAKE_PATH=/usr/lib/cmake/everest-cmake +EVEREST_CMAKE_VERSION=4d81814 +rm -rf ${EVEREST_CMAKE_PATH} +git clone https://github.com/EVerest/everest-cmake.git ${EVEREST_CMAKE_PATH} \ + && cd ${EVEREST_CMAKE_PATH} \ + && git checkout ${EVEREST_CMAKE_VERSION} + cmake \ -B "$EXT_MOUNT/build" \ -S "$EXT_MOUNT/source" \