Skip to content

Commit

Permalink
fixup! Add Ubuntu Trusty MySQL 5.5 PIC library with Embedded server f…
Browse files Browse the repository at this point in the history
…or testing to Github Actions CI
  • Loading branch information
choroba committed Jan 12, 2025
1 parent 1b5293d commit 19d14e8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,6 @@ jobs:
elif [ "${{ matrix.server-version }}" = "system-pic" ]; then
export DBD_MARIADB_TESTHOST=embedded
export DBD_MARIADB_TESTEMBDATADIR="$HOME/datadir"
export DBD_MARIADB_TESTEMBOPTIONS="--language=$HOME/mysql-server-core-5.5/usr/share/mysql/,--log-error=/dev/null"
elif [ "${{ matrix.server-version }}" = "none" ]; then
export DBD_MARIADB_TESTHOST=0.0.0.0
export DBD_MARIADB_TESTPORT=0
Expand All @@ -508,7 +507,6 @@ jobs:
export DBD_MARIADB_TESTPASSWORD=msandbox
export DBD_MARIADB_TESTHOST=127.0.0.1
export DBD_MARIADB_TESTPORT=3310
export DBD_MARIADB_TESTEMBOPTIONS="--language=`find $HOME/sandbox/* -name english | head -1 | sed 's/english//'`,--log-error=/dev/null"
fi
if [[ ${{ matrix.client-version }} =~ mysql-8 ]]; then
export DBD_MARIADB_TESTAUTHPLUGIN=mysql_native_password
Expand All @@ -527,8 +525,10 @@ jobs:
fi
elif [ "${{ matrix.client-version }}" = "same-as-server" ] && [ "${{ matrix.server-version }}" != "system" ]; then
export DBD_MARIADB_CONFIG="$HOME/mysql_config"
export DBD_MARIADB_TESTEMBOPTIONS="--language=`find $HOME/sandbox/* -name english | sed 's/english//'`,--log-error=/dev/null"
elif [ "${{ matrix.client-version }}" = "system-pic" ]; then
export DBD_MARIADB_CONFIG="$HOME/mysql_config_pic"
export DBD_MARIADB_TESTEMBOPTIONS="--language=$HOME/mysql-server-core-5.5/usr/share/mysql/,--log-error=/dev/null"
export DBD_MARIADB_REQUIREEMBSUP=1
fi
export | sed 's/^declare -x //;s/="/=/;s/"$//' | grep '^DBD_MARIADB_' >> $GITHUB_ENV
Expand Down

0 comments on commit 19d14e8

Please sign in to comment.