Skip to content

Commit 57f7269

Browse files
palichoroba
pali
authored and
choroba
committed
In Github Actions script rename CONC_* variables to CLIENT_*
1 parent 6336101 commit 57f7269

File tree

1 file changed

+37
-37
lines changed

1 file changed

+37
-37
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -330,15 +330,15 @@ jobs:
330330
*) DB=unknown ;;
331331
esac
332332
case "${{ matrix.client-version }}" in
333-
mysql*) CONC_DB=MySQL ;;
334-
mariadb*) CONC_DB=MariaDB ;;
335-
system) CONC_DB=""; ;;
336-
system-pic) CONC_DB=""; ;;
337-
same-as-server) CONC_DB=""; ;;
338-
*) CONC_DB=unknown ;;
333+
mysql*) CLIENT_DB=MySQL ;;
334+
mariadb*) CLIENT_DB=MariaDB ;;
335+
system) CLIENT_DB=""; ;;
336+
system-pic) CLIENT_DB=""; ;;
337+
same-as-server) CLIENT_DB=""; ;;
338+
*) CLIENT_DB=unknown ;;
339339
esac
340340
VERSION=`echo "${{ matrix.server-version }}" | sed 's/^[^-]*-//'`
341-
CONC_VERSION=`echo "${{ matrix.client-version }}" | sed 's/^[^-]*-//'`
341+
CLIENT_VERSION=`echo "${{ matrix.client-version }}" | sed 's/^[^-]*-//'`
342342
if [ "$DB" = "MySQL" ]; then
343343
case "$VERSION" in
344344
4.1.*) SANDBOX_URL=https://mysql.linux.cz/Downloads/MySQL-4.1/mysql-standard-$VERSION-unknown-linux-gnu-x86_64-glibc23.tar.gz ;;
@@ -381,28 +381,28 @@ jobs:
381381
SANDBOX_OPTIONS="$SANDBOX_OPTIONS --init_options=--innodb_use_native_aio=0 --my_clause=innodb_use_native_aio=0 --my_clause=performance_schema=ON"
382382
fi
383383
fi
384-
if [ "$CONC_DB" = "MySQL" ]; then
385-
case "$CONC_VERSION" in
386-
*-labs) CONC_URL=https://downloads.mysql.com/snapshots/pb/mysql-connector-c-$CONC_VERSION/mysql-connector-c-$CONC_VERSION-linux-glibc2.5-x86_64.tar.gz ;;
387-
6.0.*) CONC_URL=https://dev.mysql.com/get/mysql-connector-c-$CONC_VERSION-linux-glibc2.3-x86-64bit.tar.gz ;;
388-
6.1.[0123456789]) CONC_URL=https://dev.mysql.com/get/mysql-connector-c-$CONC_VERSION-linux-glibc2.5-x86_64.tar.gz ;;
389-
6.1.*) CONC_URL=https://dev.mysql.com/get/mysql-connector-c-$CONC_VERSION-linux-glibc2.12-x86_64.tar.gz ;;
390-
*) echo "Unsupported MySQL Connector/C version '$CONC_VERSION'"; exit 1 ;;
384+
if [ "$CLIENT_DB" = "MySQL" ]; then
385+
case "$CLIENT_VERSION" in
386+
*-labs) CLIENT_URL=https://downloads.mysql.com/snapshots/pb/mysql-connector-c-$CLIENT_VERSION/mysql-connector-c-$CLIENT_VERSION-linux-glibc2.5-x86_64.tar.gz ;;
387+
6.0.*) CLIENT_URL=https://dev.mysql.com/get/mysql-connector-c-$CLIENT_VERSION-linux-glibc2.3-x86-64bit.tar.gz ;;
388+
6.1.[0123456789]) CLIENT_URL=https://dev.mysql.com/get/mysql-connector-c-$CLIENT_VERSION-linux-glibc2.5-x86_64.tar.gz ;;
389+
6.1.*) CLIENT_URL=https://dev.mysql.com/get/mysql-connector-c-$CLIENT_VERSION-linux-glibc2.12-x86_64.tar.gz ;;
390+
*) echo "Unsupported MySQL Connector/C version '$CLIENT_VERSION'"; exit 1 ;;
391391
esac
392-
CONC_FILE="$HOME/cache/$(basename "$CONC_URL")"
393-
elif [ "$CONC_DB" = "MariaDB" ]; then
394-
case "$CONC_VERSION" in
395-
3.0.*) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz ;;
396-
3.1.[01234567]) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz ;;
397-
3.*) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-ubuntu-focal-amd64.tar.gz ;;
398-
*) CONC_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CONC_VERSION/-*/}/mariadb-connector-c-$CONC_VERSION-linux-x86_64.tar.gz ;;
392+
CLIENT_FILE="$HOME/cache/$(basename "$CLIENT_URL")"
393+
elif [ "$CLIENT_DB" = "MariaDB" ]; then
394+
case "$CLIENT_VERSION" in
395+
3.0.*) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-linux-x86_64.tar.gz ;;
396+
3.1.[01234567]) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-linux-x86_64.tar.gz ;;
397+
3.*) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-ubuntu-focal-amd64.tar.gz ;;
398+
*) CLIENT_URL=https://downloads.mariadb.com/Connectors/c/connector-c-${CLIENT_VERSION/-*/}/mariadb-connector-c-$CLIENT_VERSION-linux-x86_64.tar.gz ;;
399399
esac
400-
CONC_FILE="$HOME/cache/$(basename "$CONC_URL")"
401-
elif [ -n "$CONC_DB" ]; then
402-
echo "Unsupported Connector/C '$CONC_DB'"; exit 1
400+
CLIENT_FILE="$HOME/cache/$(basename "$CLIENT_URL")"
401+
elif [ -n "$CLIENT_DB" ]; then
402+
echo "Unsupported Connector/C '$CLIENT_DB'"; exit 1
403403
fi
404-
if [ -n "$CONC_DB" ]; then
405-
if [ ! -f "$CONC_FILE" ]; then wget --progress=bar:force "$CONC_URL" -O "$CONC_FILE" || exit 1; fi
404+
if [ -n "$CLIENT_DB" ]; then
405+
if [ ! -f "$CLIENT_FILE" ]; then wget --progress=bar:force "$CLIENT_URL" -O "$CLIENT_FILE" || exit 1; fi
406406
fi
407407
if [ "${{ matrix.client-version }}" = "system-pic" ]; then
408408
sed 's/-L\$pkglibdir *-lmysqld/-L\/usr\/lib\/mysql -lmysqld_pic /' `which mysql_config_pic` > "$HOME/mysql_config_pic"
@@ -422,14 +422,14 @@ jobs:
422422
printf '#!/bin/sh\nexec %s/msb/my sql_config "$@"\n' $SANDBOX_HOME > "$HOME/mysql_config"
423423
chmod +x $HOME/mysql_config
424424
fi
425-
if [ -n "$CONC_DB" ]; then
426-
mkdir -p "$HOME/conc"
427-
tar --strip-components=1 --directory="$HOME/conc" -xf "$CONC_FILE" || exit 1
428-
if $HOME/conc/bin/mysql_config 2>&1 | grep -q /usr/local; then
429-
rm -f $HOME/conc/bin/mysql_config
425+
if [ -n "$CLIENT_DB" ]; then
426+
mkdir -p "$HOME/client"
427+
tar --strip-components=1 --directory="$HOME/client" -xf "$CLIENT_FILE" || exit 1
428+
if $HOME/client/bin/mysql_config 2>&1 | grep -q /usr/local; then
429+
rm -f $HOME/client/bin/mysql_config
430430
fi
431-
if [ -x $HOME/conc/bin/mysql_config ]; then
432-
sed 's/-l "/-lmysqlclient "/g' -i "$HOME/conc/bin/mysql_config" || exit 1
431+
if [ -x $HOME/client/bin/mysql_config ]; then
432+
sed 's/-l "/-lmysqlclient "/g' -i "$HOME/client/bin/mysql_config" || exit 1
433433
fi
434434
fi
435435
- name: Install dependences
@@ -463,12 +463,12 @@ jobs:
463463
export DBD_MARIADB_TESTPORT=3310
464464
fi
465465
if [ "${{ matrix.client-version }}" != "system" ] && [ "${{ matrix.client-version }}" != "system-pic" ] && [ "${{ matrix.client-version }}" != "same-as-server" ]; then
466-
if [ -x $HOME/conc/bin/mysql_config ]; then
467-
export DBD_MARIADB_CONFIG="$HOME/conc/bin/mysql_config"
466+
if [ -x $HOME/client/bin/mysql_config ]; then
467+
export DBD_MARIADB_CONFIG="$HOME/client/bin/mysql_config"
468468
else
469-
INCLUDE_PATH=`find "$HOME/conc" -name "mysql.h" | sort | head -1`
469+
INCLUDE_PATH=`find "$HOME/client" -name "mysql.h" | sort | head -1`
470470
if [ -z "$INCLUDE_PATH" ]; then echo "File mysql.h was not found"; exit 1; fi
471-
LIB_PATH=`find "$HOME/conc" -name "lib*.so" | sort | head -1`
471+
LIB_PATH=`find "$HOME/client" -name "lib*.so" | sort | head -1`
472472
if [ -z "$INCLUDE_PATH" ]; then echo "File lib*.so was not found"; exit 1; fi
473473
export DBD_MARIADB_CFLAGS="-I`dirname $INCLUDE_PATH`"
474474
export DBD_MARIADB_LIBS="-L`dirname $LIB_PATH` -l`echo $LIB_PATH | sed 's/.*\/lib//;s/\.so//'`"

0 commit comments

Comments
 (0)