Skip to content

Commit

Permalink
travis: use galera-4 in 10.4 branch (#1226)
Browse files Browse the repository at this point in the history
  • Loading branch information
grooverdan authored and Jan Lindström committed Mar 14, 2019
1 parent 7b33a6a commit e121a07
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 1 addition & 4 deletions .travis.compiler.sh
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -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
Expand All @@ -135,6 +137,7 @@ addons:
- chrpath
- cmake
- gdb
- galera-4
- libaio-dev
- libboost-dev
- libcurl3-dev
Expand Down

0 comments on commit e121a07

Please sign in to comment.