This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/doris-thirdparty.git
The following commit(s) were added to refs/heads/main by this push:
new 6f68349bc43 [build] use fixed cmake version for brnach 1.2/2.0 (#305)
(#307)
6f68349bc43 is described below
commit 6f68349bc432618c9e4256abf7d91843e06f5910
Author: Mingyu Chen (Rayner) <morning...@163.com>
AuthorDate: Sun Apr 20 20:19:43 2025 -0700
[build] use fixed cmake version for brnach 1.2/2.0 (#305) (#307)
---
.github/workflows/build-1.2.yml | 12 +++++++++---
.github/workflows/build-2.0.yml | 12 +++++++++---
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build-1.2.yml b/.github/workflows/build-1.2.yml
index b1bdf7b9ddc..b0401816e6f 100644
--- a/.github/workflows/build-1.2.yml
+++ b/.github/workflows/build-1.2.yml
@@ -113,7 +113,6 @@ jobs:
'coreutils'
'gnu-getopt'
'python@3'
- 'cmake'
'ninja'
'ccache'
'bison'
@@ -138,7 +137,6 @@ jobs:
'coreutils'
'gnu-getopt'
'python@3'
- 'cmake'
'ninja'
'ccache'
'bison'
@@ -159,7 +157,7 @@ jobs:
'autoconf'
'libtool-bin'
'pkg-config'
- 'cmake'
+ 'cmake=3.22.1-1ubuntu1.22.04.2'
'ninja-build'
'ccache'
'python-is-python3'
@@ -201,12 +199,20 @@ jobs:
- name: Prepare for ${{ matrix.config.os }}
run: |
if [[ "${{ matrix.config.name }}" =~ macOS-* ]]; then
+ # Install packages except cmake
brew install ${{ matrix.config.packages }} || true
+ # Install specific version of cmake
+ brew unlink cmake || true
+ wget
https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-macos-universal.tar.gz
+ tar -xzf cmake-3.22.1-macos-universal.tar.gz
+ sudo cp -r cmake-3.22.1-macos-universal/CMake.app/Contents/*
/usr/local/
+ cmake --version
else
export DEFAULT_DIR='/opt/doris'
export PATH="${DEFAULT_DIR}/ldb-toolchain/bin:${PATH}"
sudo apt update
+ sudo apt-cache policy cmake
sudo DEBIAN_FRONTEND=noninteractive apt install --yes ${{
matrix.config.packages }}
mkdir -p "${DEFAULT_DIR}"
diff --git a/.github/workflows/build-2.0.yml b/.github/workflows/build-2.0.yml
index 41c7b8e9f16..eeeeebd0e6d 100644
--- a/.github/workflows/build-2.0.yml
+++ b/.github/workflows/build-2.0.yml
@@ -113,7 +113,6 @@ jobs:
'coreutils'
'gnu-getopt'
'python@3'
- 'cmake'
'ninja'
'ccache'
'bison'
@@ -138,7 +137,6 @@ jobs:
'coreutils'
'gnu-getopt'
'python@3'
- 'cmake'
'ninja'
'ccache'
'bison'
@@ -159,7 +157,7 @@ jobs:
'autoconf'
'libtool-bin'
'pkg-config'
- 'cmake'
+ 'cmake=3.22.1-1ubuntu1.22.04.2'
'ninja-build'
'ccache'
'python-is-python3'
@@ -218,12 +216,20 @@ jobs:
- name: Prepare for ${{ matrix.config.os }}
run: |
if [[ "${{ matrix.config.name }}" =~ macOS-* ]]; then
+ # Install packages except cmake
brew install ${{ matrix.config.packages }} || true
+ # Install specific version of cmake
+ brew unlink cmake || true
+ wget
https://github.com/Kitware/CMake/releases/download/v3.22.1/cmake-3.22.1-macos-universal.tar.gz
+ tar -xzf cmake-3.22.1-macos-universal.tar.gz
+ sudo cp -r cmake-3.22.1-macos-universal/CMake.app/Contents/*
/usr/local/
+ cmake --version
else
export DEFAULT_DIR='/opt/doris'
export PATH="${DEFAULT_DIR}/ldb-toolchain/bin:${PATH}"
sudo apt update
+ sudo apt-cache policy cmake
sudo DEBIAN_FRONTEND=noninteractive apt install --yes ${{
matrix.config.packages }}
mkdir -p "${DEFAULT_DIR}"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
