Skip to content

Commit f7f21e4

Browse files
chore: download cmake version 3.22.6 (#2194)
* chore: download cmake version 3.22.6 * chore: remove cmake install deps step * chore: trigger quality gate ci to test * chore: update run setup config --------- Co-authored-by: sangjanai <[email protected]>
1 parent 552db8f commit f7f21e4

File tree

3 files changed

+26
-4
lines changed

3 files changed

+26
-4
lines changed

.github/workflows/cortex-cpp-quality-gate.yml

+4
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ jobs:
150150
run: |
151151
cd engine
152152
mkdir -p ~/.config/cortexcpp/
153+
mkdir -p ~/.local/share/cortexcpp/
153154
echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" > ~/.config/cortexcpp/.cortexrc
154155
echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc
155156
# ./build/cortex
@@ -177,6 +178,7 @@ jobs:
177178
run: |
178179
cd engine
179180
mkdir -p ~/.config/cortexcpp/
181+
mkdir -p ~/.local/share/cortexcpp/
180182
echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc
181183
echo "huggingFaceToken: ${{ secrets.HUGGINGFACE_TOKEN_READ }}" >> ~/.config/cortexcpp/.cortexrc
182184
echo "gitHubToken: ${{ secrets.PAT_SERVICE_ACCOUNT }}" >> ~/.config/cortexcpp/.cortexrc
@@ -456,6 +458,7 @@ jobs:
456458
run: |
457459
cd engine
458460
mkdir -p ~/.config/cortexcpp/
461+
mkdir -p ~/.local/share/cortexcpp/
459462
echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc
460463
# ./build/cortex
461464
cat ~/.config/cortexcpp/.cortexrc
@@ -481,6 +484,7 @@ jobs:
481484
run: |
482485
cd engine
483486
mkdir -p ~/.config/cortexcpp/
487+
mkdir -p ~/.local/share/cortexcpp/
484488
echo "apiServerPort: 3928" > ~/.config/cortexcpp/.cortexrc
485489
echo "gitHubToken: ${{ secrets.GITHUB_TOKEN }}" > ~/.config/cortexcpp/.cortexrc
486490
# ./build/cortex

docker/Dockerfile

+11-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
2424
apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \
2525
apt-get update && \
2626
apt-get install -y --no-install-recommends \
27-
cmake \
2827
make \
2928
git \
3029
uuid-dev \
@@ -37,11 +36,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
3736
ninja-build \
3837
pkg-config \
3938
python3-pip \
40-
openssl && \
39+
openssl \
40+
libssl-dev && \
4141
pip3 install awscli && \
4242
apt-get clean && \
4343
rm -rf /var/lib/apt/lists/*
4444

45+
# Download and install CMake 3.22.6
46+
RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \
47+
tar -xzf /tmp/cmake.tar.gz -C /tmp && \
48+
cd /tmp/cmake-3.22.6 && \
49+
./bootstrap && \
50+
make -j$(nproc) && \
51+
make install && \
52+
rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6
53+
4554
ARG CORTEX_CPP_VERSION=latest
4655
ARG CMAKE_EXTRA_FLAGS=""
4756

docker/Dockerfile.cache

+11-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
2424
apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" && \
2525
apt-get update && \
2626
apt-get install -y --no-install-recommends \
27-
cmake \
2827
make \
2928
git \
3029
uuid-dev \
@@ -37,11 +36,21 @@ RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/nul
3736
ninja-build \
3837
pkg-config \
3938
python3-pip \
40-
openssl && \
39+
openssl \
40+
libssl-dev && \
4141
pip3 install awscli && \
4242
apt-get clean && \
4343
rm -rf /var/lib/apt/lists/*
4444

45+
# Download and install CMake 3.22.6
46+
RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.6/cmake-3.22.6.tar.gz -q -O /tmp/cmake.tar.gz && \
47+
tar -xzf /tmp/cmake.tar.gz -C /tmp && \
48+
cd /tmp/cmake-3.22.6 && \
49+
./bootstrap && \
50+
make -j$(nproc) && \
51+
make install && \
52+
rm -rf /tmp/cmake.tar.gz /tmp/cmake-3.22.6
53+
4554
ARG CORTEX_CPP_VERSION=latest
4655
ARG CMAKE_EXTRA_FLAGS=""
4756

0 commit comments

Comments
 (0)