Skip to content

Commit 282f663

Browse files
committed
Fix
1 parent 2b86b06 commit 282f663

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

.devcontainer/Dockerfile

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,37 @@ FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/cpp:1-ubuntu-22.04
33
# Install software-properties-common for add-apt-repository
44
RUN apt-get update && apt-get -y install software-properties-common
55

6+
# Install CMake
7+
ENV CMAKE_VERSION=3.27.7
8+
RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get -y update && apt-get -y install make && \
9+
wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz && \
10+
tar -xvzf cmake-${CMAKE_VERSION}.tar.gz && cd cmake-${CMAKE_VERSION} && \
11+
./bootstrap && \
12+
make -j$(nproc) && \
13+
make install
14+
615
# Install C++ tools and libraries
7-
RUN add-apt-repository ppa:ubuntu-toolchain-r/test && apt-get -y update && apt-get -y install \
8-
git gdb cmake ninja-build libidn11-dev ragel yasm protobuf-compiler \
16+
RUN apt-get -y update && apt-get -y install \
17+
git gdb ninja-build libidn11-dev ragel yasm protobuf-compiler \
918
protobuf-compiler-grpc libprotobuf-dev libgrpc++-dev libgrpc-dev libgrpc++1 libgrpc10 \
1019
rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev libsnappy-dev libgtest-dev libgmock-dev \
11-
libbz2-dev libdouble-conversion-dev libstdc++-13-dev liblz4-dev libssl-dev \
20+
libbz2-dev libdouble-conversion-dev libstdc++-13-dev gcc-13 g++-13 liblz4-dev libssl-dev \
1221
&& apt-get clean && rm -rf /var/lib/apt/lists/*
1322

1423
# Install LLVM
1524
RUN wget https://apt.llvm.org/llvm.sh && \
1625
chmod u+x llvm.sh && \
1726
./llvm.sh 16
1827

19-
# Update alternatives to use clang-16 and clang++-16 by default
28+
# Update alternatives to use clang-16 by default
2029
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100 && \
2130
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-16 100 && \
2231
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
2332

33+
# Update alternatives to use gcc-13 by default
34+
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 && \
35+
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100
36+
2437
# Install libiconv
2538
ENV LIBICONV_VERSION=1.15
2639
RUN wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${LIBICONV_VERSION}.tar.gz && \

.github/actions/prepare_vm/action.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ description: Install required packages
44
runs:
55
using: "composite"
66
steps:
7+
- name: Install CMake and Ninja
8+
uses: lukka/get-cmake@v3.27.7
79
- name: Install dependencies
810
shell: bash
911
run: |
1012
sudo add-apt-repository ppa:ubuntu-toolchain-r/test
1113
sudo apt-get -y update
12-
sudo apt-get -y install git cmake ninja-build libidn11-dev ragel yasm protobuf-compiler \
14+
sudo apt-get -y install git libidn11-dev ragel yasm protobuf-compiler \
1315
protobuf-compiler-grpc libprotobuf-dev libgrpc++-dev libgrpc-dev libgrpc++1 libgrpc10 \
1416
rapidjson-dev zlib1g-dev libxxhash-dev libzstd-dev libsnappy-dev libgtest-dev libgmock-dev \
1517
libbz2-dev libdouble-conversion-dev libstdc++-13-dev gcc-13 g++-13

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.15)
1+
cmake_minimum_required(VERSION 3.5)
22

33
file(READ "src/version.h" YDB_SDK_VERSION_FILE_RAW)
44
string(REGEX MATCH "YDB_SDK_VERSION = \"([0-9]+\\.[0-9]+\\.[0-9]+)\"" _ ${YDB_SDK_VERSION_FILE_RAW})

0 commit comments

Comments
 (0)