diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml index 279dd77d6..fc2d52b63 100644 --- a/.github/workflows/cortex-cpp-quality-gate.yml +++ b/.github/workflows/cortex-cpp-quality-gate.yml @@ -150,6 +150,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" > ~/.config/cortexcpp/.cortexrc echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc # ./build/cortex @@ -177,6 +178,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" >> ~/.config/cortexcpp/.cortexrc echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc @@ -456,6 +458,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc # ./build/cortex cat ~/.config/cortexcpp/.cortexrc @@ -481,6 +484,7 @@ jobs: run: | cd engine mkdir -p ~/.config/cortexcpp/ + mkdir -p ~/.local/share/cortexcpp/ echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc # ./build/cortex diff --git a/docker/Dockerfile b/docker/Dockerfile index 744c3899c..5f04da12e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \ apt-get update && \ apt-get install -y --no-install-recommends \ - cmake \ make \ git \ uuid-dev \ @@ -37,11 +36,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul ninja-build \ pkg-config \ python3-pip \ - openssl && \ + openssl \ + libssl-dev && \ pip3 install awscli && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Download and install CMake 3.22.6 +RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \ + tar -xzf /tmp/cmake.tar.gz -C /tmp && \ + cd /tmp/cmake-3.22.6 && \ + ./bootstrap && \ + make -j$(nproc) && \ + make install && \ + rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6 + ARG CORTEX_CPP_VERSION=latest ARG CMAKE_EXTRA_FLAGS="" diff --git a/docker/Dockerfile.cache b/docker/Dockerfile.cache index 0a9cbe02d..3eabc5dce 100644 --- a/docker/Dockerfile.cache +++ b/docker/Dockerfile.cache @@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \ apt-get update && \ apt-get install -y --no-install-recommends \ - cmake \ make \ git \ uuid-dev \ @@ -37,11 +36,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul ninja-build \ pkg-config \ python3-pip \ - openssl && \ + openssl \ + libssl-dev && \ pip3 install awscli && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Download and install CMake 3.22.6 +RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \ + tar -xzf /tmp/cmake.tar.gz -C /tmp && \ + cd /tmp/cmake-3.22.6 && \ + ./bootstrap && \ + make -j$(nproc) && \ + make install && \ + rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6 + ARG CORTEX_CPP_VERSION=latest ARG CMAKE_EXTRA_FLAGS=""