Skip to content

Commit

Permalink
travis fix:
Browse files Browse the repository at this point in the history
Copy Connector/C source dir into server subdirectory to retrieve
latest commit or pull request.
  • Loading branch information
9EOR9 committed Apr 21, 2022
1 parent f60a31b commit 2638fae
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -e

export CC_DIR=/home/travis/build/mariadb-corporation/mariadb-connector-c
if [ -n "$server_branch" ] ; then

###################################################################################################################
Expand All @@ -17,6 +18,8 @@ if [ -n "$server_branch" ] ; then
git clone -b ${server_branch} https://github.com/mariadb/server ../workdir-server

cd ../workdir-server
export SERVER_DIR=$pwd

# don't pull in submodules. We want the latest C/C as libmariadb
# build latest server with latest C/C as libmariadb
# skip to build some storage engines to speed up the build
Expand All @@ -26,18 +29,19 @@ if [ -n "$server_branch" ] ; then
if [ -n "$TRAVIS_PULL_REQUEST" ] && [ "$TRAVIS_PULL_REQUEST" != "false" ] ; then
# fetching pull request
echo "fetching PR"
git fetch origin pull/${TRAVIS_PULL_REQUEST}/head:PR_${TRAVIS_PULL_REQUEST}
echo "checkout PR"
git checkout PR_${TRAVIS_PULL_REQUEST}
else
echo "checkout commit"
git checkout ${TRAVIS_COMMIT}
fi

cd ..
cp $CC_DIR/* $SERVER_DIR/libmariadb -r
cd $SERVER_DIR
git add libmariadb

cd $SERVER_DIR/bld
make -j9


cd mysql-test/
./mysql-test-run.pl --suite=main ${TEST_OPTION} --parallel=auto --skip-test=session_tracker_last_gtid

Expand Down

0 comments on commit 2638fae

Please sign in to comment.