Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
3795adcd
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3795adcd
编写于
1月 19, 2018
作者:
P
proller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix travis
上级
9ea25219
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
37 addition
and
14 deletion
+37
-14
.travis.yml
.travis.yml
+31
-8
debian/.pbuilderrc
debian/.pbuilderrc
+0
-2
release
release
+1
-1
utils/travis/normal.sh
utils/travis/normal.sh
+2
-2
utils/travis/pbuilder.sh
utils/travis/pbuilder.sh
+3
-1
未找到文件。
.travis.yml
浏览文件 @
3795adcd
language
:
cpp
language
:
generic
matrix
:
include
:
...
...
@@ -13,8 +13,9 @@ matrix:
sources
:
-
ubuntu-toolchain-r-test
packages
:
[
g++-7
,
libicu-dev
,
libreadline-dev
,
libmysqlclient-dev
,
unixodbc-dev
,
libltdl-dev
,
libssl-dev
,
libboost-dev
,
zlib1g-dev
,
libdouble-conversion-dev
,
libzookeeper-mt-dev
,
libsparsehash-dev
,
librdkafka-dev
,
libcapnp-dev
,
libsparsehash-dev
,
libgoogle-perftools-dev
,
bash
,
expect
,
python
,
python-lxml
,
python-termcolor
,
curl
,
perl
,
sudo
]
env
:
-
MATRIX_EVAL="
CC=gcc-7 &&
CXX=g++-7"
-
MATRIX_EVAL="
export CC=gcc-7 && export
CXX=g++-7"
script
:
-
utils/travis/normal.sh
...
...
@@ -35,12 +36,7 @@ matrix:
packages
:
[
g++-7
,
clang-5.0
,
libicu-dev
,
libreadline-dev
,
libmysqlclient-dev
,
unixodbc-dev
,
libltdl-dev
,
libssl-dev
,
libboost-dev
,
zlib1g-dev
,
libdouble-conversion-dev
,
libzookeeper-mt-dev
,
libsparsehash-dev
,
librdkafka-dev
,
libcapnp-dev
,
libsparsehash-dev
,
libgoogle-perftools-dev
,
bash
,
expect
,
python
,
python-lxml
,
python-termcolor
,
curl
,
perl
,
sudo
]
env
:
-
MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
before_script
:
# fix gcc after clang
-
export CC=clang-5.0
-
export CXX=clang++-5.0
-
MATRIX_EVAL="export CC=clang-5.0 && export CXX=clang++-5.0"
script
:
-
utils/travis/normal.sh
...
...
@@ -59,8 +55,35 @@ matrix:
apt
:
packages
:
[
pbuilder
,
fakeroot
,
debhelper
]
env
:
-
MATRIX_EVAL="export CC=clang-5.0 && export CXX=clang++-5.0"
script
:
-
utils/travis/pbuilder.sh
# TODO: test and enable
# - os: osx
# osx_image: xcode9.2
#
# cache:
# ccache: true
# timeout: 1000
#
# before_install:
# - brew install unixodbc libtool gettext zlib readline ccache gcc || true
# - brew link --overwrite gcc || true
#
# env:
# - MATRIX_EVAL="export CC=gcc-7 && export CXX=g++-7"
#
# script:
# - utils/travis/normal.sh
allow_failures
:
-
os
:
osx
before_install
:
-
echo "${MATRIX_EVAL}"
-
eval "${MATRIX_EVAL}"
debian/.pbuilderrc
浏览文件 @
3795adcd
...
...
@@ -160,8 +160,6 @@ esac
# will test symbols
EXTRAPACKAGES+=" gdb "
export CCACHE_PREFIX=
export DEB_BUILD_OPTIONS=parallel=`nproc`
# Floating bug with permissions:
...
...
release
浏览文件 @
3795adcd
...
...
@@ -65,7 +65,7 @@ elif [[ $BUILD_TYPE == 'debug' ]]; then
fi
if
[
-z
"
$THREAD_COUNT
"
]
;
then
THREAD_COUNT
=
`
nproc
||
grep
-c
^processor /proc/cpuinfo
`
THREAD_COUNT
=
`
nproc
||
grep
-c
^processor /proc/cpuinfo
||
sysctl
-n
hw.ncpu
||
echo
4
`
fi
CMAKE_FLAGS
=
"
$LIBTCMALLOC_OPTS
-DCMAKE_BUILD_TYPE=
$CMAKE_BUILD_TYPE
-DUSE_EMBEDDED_COMPILER=1
$CMAKE_FLAGS
"
...
...
utils/travis/normal.sh
浏览文件 @
3795adcd
...
...
@@ -22,12 +22,12 @@ cmake .. -DCMAKE_CXX_COMPILER=`which $CXX` -DCMAKE_C_COMPILER=`which $CC` \
`
# Does not optimize to speedup build, skip debug info to use less disk` \
-DCMAKE_C_FLAGS_ADD
=
"-O0 -g0"
-DCMAKE_CXX_FLAGS_ADD
=
"-O0 -g0"
\
`
# ignore ccache disabler on trusty` \
-DCMAKE_C_COMPILER_LAUNCHER
=
/usr/bin/ccache
-DCMAKE_CXX_COMPILER_LAUNCHER
=
/usr/bin/ccache
\
-DCMAKE_C_COMPILER_LAUNCHER
=
`
which ccache
`
-DCMAKE_CXX_COMPILER_LAUNCHER
=
`
which ccache
`
\
`
# Use all possible contrib libs from system` \
-DUNBUNDLED
=
1
\
`
# Disable all features` \
-DENABLE_CAPNP
=
0
-DENABLE_RDKAFKA
=
0
-DUSE_EMBEDDED_COMPILER
=
0
-DENABLE_TCMALLOC
=
0
-DENABLE_UNWIND
=
0
-DENABLE_MYSQL
=
0
\
&&
make
-j
`
nproc
||
grep
-c
^processor /proc/cpuinfo
`
clickhouse-bundle
\
&&
make
-j
`
nproc
||
grep
-c
^processor /proc/cpuinfo
||
sysctl
-n
hw.ncpu
||
echo
4
`
clickhouse-bundle
\
`
# Skip tests:` \
`
# 00281 requires internal compiler` \
`
# 00428 requires sudo (not all vms allow this)` \
...
...
utils/travis/pbuilder.sh
浏览文件 @
3795adcd
#!/bin/sh
# env CXX=clang++-5.0 CC=clang-5.0 DH_VERBOSE=1 utils/travis/pbuilder.sh
set
-e
set
-x
...
...
@@ -14,7 +16,7 @@ env TEST_RUN=1 \
`
# travisci will not upload ccache cache after timeout (48min), use our less timeout` \
PBUILDER_OPT
=
"--timeout 35m"
\
`
# clang faster than gcc` \
DEB_CC
=
clang-5.0
DEB_CXX
=
clang++-5.0
\
DEB_CC
=
$CC
DEB_CXX
=
$CXX
\
CCACHE_SIZE
=
4G
CCACHEDIR
=
$HOME
/.ccache
\
`
# Disable all features` \
CMAKE_FLAGS
=
"-DCMAKE_BUILD_TYPE=Debug -DUNBUNDLED=1 -DENABLE_UNWIND=0 -DENABLE_MYSQL=0 -DENABLE_CAPNP=0 -DENABLE_RDKAFKA=0 -DUSE_EMBEDDED_COMPILER=0 -DCMAKE_C_FLAGS_ADD='-O0 -g0' -DCMAKE_CXX_FLAGS_ADD='-O0 -g0'"
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录