Skip to content

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

Adding s390x to Travis builds

parent 852dcb9a
Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 56 deletions
.travis.yml
View file @ 193bc89a
...@@ -8,9 +8,7 @@ git: ...@@ -8,9 +8,7 @@ git:
depth: 2 depth: 2
language: cpp language: cpp
os: os: osx
- linux
- osx
osx_image: xcode10.1 osx_image: xcode10.1
compiler: compiler:
- gcc - gcc
...@@ -32,6 +30,56 @@ env: ...@@ -32,6 +30,56 @@ env:
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
- CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles - CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=csv,federated,funcs_1,funcs_2,gcol,handler,heap,json,maria,perfschema,plugins,multi_source,roles
- CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main - CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons:
apt:
sources: &add-sources
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-6.0
- llvm-toolchain-xenial-7
- sourceline: 'deb [arch=amd64,arm64,i386,ppc64el] http://ftp.osuosl.org/pub/mariadb/repo/10.4/ubuntu xenial main'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?search=0xF1656F24C74CD1D8&op=get'
packages: &common-packages
# 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
- chrpath
- cmake
- 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
- psmisc
- zlib1g-dev
- libcrack2-dev
- cracklib-runtime
- libjemalloc-dev
- libsnappy-dev
- liblzma-dev
- uuid-dev
# libsystemd-daemon-dev # https://github.com/travis-ci/apt-package-whitelist/issues/3882
matrix: matrix:
exclude: exclude:
...@@ -40,9 +88,6 @@ matrix: ...@@ -40,9 +88,6 @@ matrix:
- os: osx - os: osx
compiler: clang compiler: clang
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
- os: linux
compiler: clang
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
include: include:
- os: linux - os: linux
compiler: gcc compiler: gcc
...@@ -93,51 +138,22 @@ matrix: ...@@ -93,51 +138,22 @@ matrix:
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;
# Until OSX becomes a bit more stable: MDEV-12435 MDEV-16213 - os: linux
allow_failures: arch: s390x
- os: osx dist: bionic
compiler: clang compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl env:
- os: osx - DebPackages
compiler: clang addons:
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
- os: osx
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
- os: osx
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
- os: osx
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
- os: osx
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
addons:
apt: apt:
sources: packages: # make sure these match debian/control contents
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-6.0
- llvm-toolchain-xenial-7
- sourceline: 'deb [arch=amd64,arm64,i386,ppc64el] http://ftp.osuosl.org/pub/mariadb/repo/10.4/ubuntu xenial main'
key_url: 'http://keyserver.ubuntu.com/pks/lookup?search=0xF1656F24C74CD1D8&op=get'
packages: # 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
- debhelper
- dh-apparmor
- dpatch
- gdb - gdb
- galera-4
- libaio-dev - libaio-dev
- libboost-dev - libboost-dev
- libcurl3-dev - libcurl3-dev
...@@ -153,17 +169,239 @@ addons: ...@@ -153,17 +169,239 @@ addons:
- libxml2-dev - libxml2-dev
- lsb-release - lsb-release
- perl - perl
- po-debconf
- psmisc - psmisc
- zlib1g-dev - zlib1g-dev
- libcrack2-dev - libcrack2-dev
- cracklib-runtime - cracklib-runtime
- libjemalloc-dev - libjemalloc-dev
- libsnappy-dev - libsnappy-dev
- galera-3
- liblzma-dev - liblzma-dev
- libzmq-dev - libzmq3-dev
- libdistro-info-perl
- uuid-dev - uuid-dev
- devscripts
- fakeroot
- dh-systemd
- libsystemd-dev
- libzstd-dev
- unixodbc-dev
script:
- ${CC} --version ; ${CXX} --version
- env DEB_BUILD_OPTIONS="parallel=4" debian/autobake-deb.sh;
- os: linux
compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: gcc
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
- os: linux
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-4, libzmq-dev]
#s390x matrix
- os: linux
arch: s390x
dist: bionic
compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: gcc
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: gcc
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: gcc
env: CC_VERSION=8 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
- os: linux
arch: s390x
dist: bionic
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
addons:
apt:
sources: *add-sources
packages: [ *common-packages, galera-3, libzmq3-dev]
# Until OSX becomes a bit more stable: MDEV-12435 MDEV-16213
allow_failures:
- os: osx
compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rpl
- os: osx
compiler: clang
env: CC_VERSION=6 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=main
- os: osx
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
- os: osx
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=binlog,binlog_encryption,encryption
- os: osx
compiler: clang
env: CC_VERSION=7 TYPE=RelWithDebInfo MYSQL_TEST_SUITES=rocksdb,versioning
- os: osx
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
# libsystemd-daemon-dev # https://github.com/travis-ci/apt-package-whitelist/issues/3882
before_install: before_install:
- if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then - if [[ "${TRAVIS_OS_NAME}" == 'osx' ]]; then
......
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