diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2019-03-14 17:20:32 +1100 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-03-14 08:20:32 +0200 |
| commit | e121a078bf54a1def01f3e28d810a6d68ca9b637 (patch) | |
| tree | 4b83d455d0e0162c8948439f3801368e57565f08 | |
| parent | 7b33a6a1ea80dc628e6614368449e6b2bcb267f2 (diff) | |
| download | mariadb-git-e121a078bf54a1def01f3e28d810a6d68ca9b637.tar.gz | |
travis: use galera-4 in 10.4 branch (#1226)
| -rwxr-xr-x | .travis.compiler.sh | 5 | ||||
| -rw-r--r-- | .travis.yml | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.compiler.sh b/.travis.compiler.sh index 4748c0b9729..98d8197d371 100755 --- a/.travis.compiler.sh +++ b/.travis.compiler.sh @@ -38,10 +38,7 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then export CC=gcc-${CC_VERSION} fi if [[ ${CC_VERSION} == 7 ]]; then - wget http://mirrors.kernel.org/ubuntu/pool/universe/p/percona-xtradb-cluster-galera-2.x/percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb ; - ar vx percona-xtradb-cluster-galera-2.x_165-0ubuntu1_amd64.deb - tar -xJvf data.tar.xz - export WSREP_PROVIDER=$PWD/usr/lib/libgalera_smm.so + export WSREP_PROVIDER=/usr/lib/galera/libgalera_smm.so MYSQL_TEST_SUITES="${MYSQL_TEST_SUITES},wsrep" fi fi diff --git a/.travis.yml b/.travis.yml index 85d02cc4bec..9c862d496c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -120,6 +120,8 @@ addons: - 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 @@ -135,6 +137,7 @@ addons: - chrpath - cmake - gdb + - galera-4 - libaio-dev - libboost-dev - libcurl3-dev |