Add missing steps for cmake build (#8524)
Summary: Some cmake and test configuration are set in pre-steps enviroment variables. Add the missing steps. Pull Request resolved: https://github.com/facebook/rocksdb/pull/8524 Test Plan: CI pass Reviewed By: siying Differential Revision: D29682731 Pulled By: jay-zhuang fbshipit-source-id: afda1acf6a7b76989db450442b0b27f387388b9d
This commit is contained in:
parent
803a40d412
commit
31193a73a4
@ -311,7 +311,7 @@ jobs:
|
|||||||
image: ubuntu-1604:202104-01
|
image: ubuntu-1604:202104-01
|
||||||
resource_class: 2xlarge
|
resource_class: 2xlarge
|
||||||
steps:
|
steps:
|
||||||
- checkout # check out the code in the project directory
|
- pre-steps
|
||||||
- install-gflags
|
- install-gflags
|
||||||
- upgrade-cmake
|
- upgrade-cmake
|
||||||
- run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20) | .circleci/cat_ignore_eagain
|
- run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20) | .circleci/cat_ignore_eagain
|
||||||
@ -322,7 +322,7 @@ jobs:
|
|||||||
image: ubuntu-2004:202104-01
|
image: ubuntu-2004:202104-01
|
||||||
resource_class: 2xlarge
|
resource_class: 2xlarge
|
||||||
steps:
|
steps:
|
||||||
- checkout # check out the code in the project directory
|
- pre-steps
|
||||||
- install-gflags
|
- install-gflags
|
||||||
- install-benchmark
|
- install-benchmark
|
||||||
- run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20 && make microbench) | .circleci/cat_ignore_eagain
|
- run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20 && make microbench) | .circleci/cat_ignore_eagain
|
||||||
@ -748,12 +748,6 @@ workflows:
|
|||||||
name: "build-windows-vs2017"
|
name: "build-windows-vs2017"
|
||||||
vs_year: "2017"
|
vs_year: "2017"
|
||||||
cmake_generator: "Visual Studio 15 Win64"
|
cmake_generator: "Visual Studio 15 Win64"
|
||||||
# build-windows-vs2015:
|
|
||||||
# jobs:
|
|
||||||
# - build-windows:
|
|
||||||
# name: "build-windows-vs2015"
|
|
||||||
# vs_year: "2015"
|
|
||||||
# cmake_generator: "Visual Studio 14 Win64"
|
|
||||||
build-java:
|
build-java:
|
||||||
jobs:
|
jobs:
|
||||||
- build-linux-java
|
- build-linux-java
|
||||||
|
Loading…
Reference in New Issue
Block a user