diff options
author | dcherednik <dcherednik@ydb.tech> | 2023-08-08 19:09:59 +0300 |
---|---|---|
committer | dcherednik <dcherednik@ydb.tech> | 2023-08-08 20:06:19 +0300 |
commit | f5e11e4e5841f5e6dbb9d0c29e958ff024bca4ab (patch) | |
tree | 95c84ab60689458cfb476f806a05ab2fe3fa1dfb | |
parent | 3b1425ae1bdde07577f85e623296e01229b65dc3 (diff) | |
download | ydb-f5e11e4e5841f5e6dbb9d0c29e958ff024bca4ab.tar.gz |
Use clang-14 for build, update instruction
-rw-r--r-- | .github/actions/prepare_vm/action.yaml | 8 | ||||
-rw-r--r-- | BUILD.md | 24 | ||||
-rw-r--r-- | clang.toolchain | 8 |
3 files changed, 12 insertions, 28 deletions
diff --git a/.github/actions/prepare_vm/action.yaml b/.github/actions/prepare_vm/action.yaml index ea63bae71b0..73648611f7b 100644 --- a/.github/actions/prepare_vm/action.yaml +++ b/.github/actions/prepare_vm/action.yaml @@ -16,19 +16,15 @@ runs: run: | wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo apt-key add - echo "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null - - name: Add cmake, llvm apt repositories for Ubuntu < 22.04 - shell: bash - if: steps.init.outputs.distro_name == 'Ubuntu' && steps.init.outputs.distro_release == '18.04' - run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - - echo "deb https://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-12 main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null + echo "deb https://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null - name: Install YDB Build dependencies shell: bash run: | sudo apt-get update sudo apt-get -y install --no-install-recommends \ python-is-python3 git cmake python3-pip ninja-build antlr3 m4 \ - clang-12 lld-12 llvm-12 libidn11-dev libaio1 libaio-dev parallel s3cmd + clang-14 lld-14 llvm-14 libidn11-dev libaio1 libaio-dev parallel s3cmd sudo pip3 install conan==1.59 pytest==7.1.3 pytest-timeout pytest-xdist==3.3.1 setproctitle==1.3.2 grpcio grpcio-tools PyHamcrest tornado xmltodict pyarrow - name: install ccache shell: bash @@ -6,8 +6,8 @@ Below is a list of packages that need to be installed before building YDB. 'How to Build' section contains step by step instructions to obtain these packages. - cmake 3.22+ - - clang-12 - - lld-12 + - clang-14 + - lld-14 - git 2.20+ - python3.8 - pip3 @@ -28,28 +28,16 @@ ## (optional) Add CMake and LLVM APT repositories (for Ubuntu 18.04 and 20.04) -## Ubuntu 18.04 +## Ubuntu 18.04 and Ubuntu 20.04 -For Ubuntu 18.04, you have to add CMake and LLVM APT repositories: +For Ubuntu 18.04 and Ubuntu 20.04, you have to add CMake and LLVM APT repositories: ```bash wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo apt-key add - echo "deb http://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - -echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-12 main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null - -sudo apt-get update - -``` - -## Ubuntu 20.04 - -For Ubuntu 20.04, you have to add CMake APT repository: - -```bash -wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo apt-key add - -echo "deb http://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null +echo "deb http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-14 main" | sudo tee /etc/apt/sources.list.d/llvm.list >/dev/null sudo apt-get update @@ -59,7 +47,7 @@ sudo apt-get update ## Install dependencies ```bash -sudo apt-get -y install git cmake python3-pip ninja-build antlr3 m4 clang-12 lld-12 libidn11-dev libaio1 libaio-dev llvm-12 +sudo apt-get -y install git cmake python3-pip ninja-build antlr3 m4 clang-14 lld-14 libidn11-dev libaio1 libaio-dev llvm-14 sudo pip3 install conan==1.59 ``` diff --git a/clang.toolchain b/clang.toolchain index 5097ea571c7..b8ce37232d7 100644 --- a/clang.toolchain +++ b/clang.toolchain @@ -1,8 +1,8 @@ -set(CMAKE_C_COMPILER clang-12) -set(CMAKE_CXX_COMPILER clang++-12) +set(CMAKE_C_COMPILER clang-14) +set(CMAKE_CXX_COMPILER clang++-14) set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld -rdynamic") set(CMAKE_SHARED_LINKER_FLAGS "-fuse-ld=lld") set(CMAKE_C_STANDARD_LIBRARIES "-lc -lm") set(CMAKE_CXX_STANDARD_LIBRARIES "-lc -lm") -set(ENV{CC} clang-12) -set(ENV{CXX} clang++-12) +set(ENV{CC} clang-14) +set(ENV{CXX} clang++-14) |