Skip to content

M
MariaDB
Commit c12609dd authored by Namrata Bhave's avatar Namrata Bhave Committed by Vlad
Browse files
Options

Review comments: Refactoring the duplicates 

Have separated out the common dependencies on top.
parent 193bc89a
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 167 deletions
.travis.yml
View file @ c12609dd
...@@ -40,16 +40,6 @@ addons: ...@@ -40,16 +40,6 @@ addons:
key_url: 'http://keyserver.ubuntu.com/pks/lookup?search=0xF1656F24C74CD1D8&op=get' key_url: 'http://keyserver.ubuntu.com/pks/lookup?search=0xF1656F24C74CD1D8&op=get'
packages: &common-packages packages: &common-packages
# make sure these include all compilers and all build dependencies (see list above) # make sure these include all compilers and all build dependencies (see list above)
- gcc-6
- g++-6
- gcc-7
- g++-7
- gcc-8
- g++-8
- clang-6.0
- llvm-6.0-dev
- clang-7
- llvm-7-dev
- bison - bison
- chrpath - chrpath
- cmake - cmake
...@@ -95,46 +85,8 @@ matrix: ...@@ -95,46 +85,8 @@ matrix:
- DebPackages - DebPackages
addons: addons:
apt: apt:
packages: # make sure these match debian/control contents sources: *add-sources
- bison packages: [ *common-packages, debhelper, dh-apparmor, dpatch, po-debconf, libzmq-dev, libdistro-info-perl, devscripts, fakeroot, dh-systemd, libsystemd-dev, libzstd-dev, unixodbc-dev] # make sure these match debian/control contents
- chrpath
- cmake
- debhelper
- dh-apparmor
- dpatch
- gdb
- libaio-dev
- libboost-dev
- libcurl3-dev
- libdbd-mysql
- libjudy-dev
- libncurses5-dev
- libpam0g-dev
- libpcre3-dev
- libreadline-gplv2-dev
- libstemmer-dev
- libssl-dev
- libnuma-dev
- libxml2-dev
- lsb-release
- perl
- po-debconf
- psmisc
- zlib1g-dev
- libcrack2-dev
- cracklib-runtime
- libjemalloc-dev
- libsnappy-dev
- liblzma-dev
- libzmq-dev
- libdistro-info-perl
- uuid-dev
- devscripts
- fakeroot
- dh-systemd
- libsystemd-dev
- libzstd-dev
- unixodbc-dev
script: script:
- ${CC} --version ; ${CXX} --version - ${CC} --version ; ${CXX} --version
- env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh; - env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh;
...@@ -146,196 +98,121 @@ matrix: ...@@ -146,196 +98,121 @@ matrix:
- DebPackages - DebPackages
addons: addons:
apt: apt:
packages: # make sure these match debian/control contents sources: *add-sources
- bison packages: [ *common-packages, debhelper, dh-apparmor, dpatch, po-debconf, libzmq3-dev, libdistro-info-perl, devscripts, fakeroot, dh-systemd, libsystemd-dev, libzstd-dev, unixodbc-dev] # make sure these match debian/control contents
- chrpath
- cmake
- debhelper
- dh-apparmor
- dpatch
- gdb
- libaio-dev
- libboost-dev
- libcurl3-dev
- libdbd-mysql
- libjudy-dev
- libncurses5-dev
- libpam0g-dev
- libpcre3-dev
- libreadline-gplv2-dev
- libstemmer-dev
- libssl-dev
- libnuma-dev
- libxml2-dev
- lsb-release
- perl
- po-debconf
- psmisc
- zlib1g-dev
- libcrack2-dev
- cracklib-runtime
- libjemalloc-dev
- libsnappy-dev
- galera-3
- liblzma-dev
- libzmq3-dev
- libdistro-info-perl
- uuid-dev
- devscripts
- fakeroot
- dh-systemd
- libsystemd-dev
- libzstd-dev
- unixodbc-dev
script: script:
- ${CC} --version ; ${CXX} --version - ${CC} --version ; ${CXX} --version
- env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh; - env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh;
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons: addons: &gcc6_addons
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev] packages: [ *common-packages, gcc-6, g++-6, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
addons: addons: *gcc6_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons: addons: *gcc6_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons: addons: &gcc7_addons
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev] packages: [ *common-packages, gcc-7, g++-7, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons: addons: *gcc7_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
addons: addons: *gcc7_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: gcc compiler: gcc
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons: addons:
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev] packages: [ *common-packages, gcc-8, g++-8, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: clang compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons: addons: &clang6_addons
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev] packages: [ *common-packages, clang-6.0, llvm-6.0-dev, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: clang compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
addons: addons: *clang6_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: clang compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons: addons: *clang6_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: clang compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons: addons: &clang7_addons
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev] packages: [ *common-packages, clang-7, llvm-7-dev, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: clang compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons: addons: *clang7_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux - os: linux
compiler: clang compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
addons: addons: *clang7_addons
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
#s390x matrix #s390x matrix
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons: addons: &gcc6_addons_s390x
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev] packages: [ *common-packages, gcc-6, g++-6, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
addons: addons: *gcc6_addons_s390x
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons: addons: *gcc6_addons_s390x
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons: addons: &gcc7_addons_s390x
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev] packages: [ *common-packages, gcc-7, g++-7, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons: addons: *gcc7_addons_s390x
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: gcc compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
addons: addons: *gcc7_addons_s390x
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
...@@ -344,43 +221,43 @@ matrix: ...@@ -344,43 +221,43 @@ matrix:
addons: addons:
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev] packages: [ *common-packages, gcc-8, g++-8, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=archive,optimizer_unfixed_bugs,parts,sys_vars,unit,vcol,innodb,innodb_gis,innodb_zip,innodb_fts
addons: addons: &clang6_addons_s390x
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev] packages: [ *common-packages, clang-6.0, llvm-6.0-dev, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons: *clang6_addons_s390x
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons: addons: &clang7_addons_s390x
apt: apt:
sources: *add-sources sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev] packages: [ *common-packages, clang-7, llvm-7-dev, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons: addons: *clang7_addons_s390x
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux - os: linux
arch: s390x arch: s390x
dist: bionic dist: bionic
compiler: clang compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
addons: addons: *clang7_addons_s390x
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
# Until OSX becomes a bit more stable: MDEV-12435 MDEV-16213 # Until OSX becomes a bit more stable: MDEV-12435 MDEV-16213
allow_failures: allow_failures:
- os: osx - os: osx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7