From a358b453ce8cb47f5addba3824c75c75ebbe1aff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 22 Jun 2023 21:56:15 +0200 Subject: [PATCH] Test CI --- .github/workflows/github_ci_php71_pgsql.yml | 12 +++++------- .github/workflows/github_ci_php81_mysql.yml | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/github_ci_php71_pgsql.yml b/.github/workflows/github_ci_php71_pgsql.yml index ac045bf1667..bd6f9c51cee 100644 --- a/.github/workflows/github_ci_php71_pgsql.yml +++ b/.github/workflows/github_ci_php71_pgsql.yml @@ -118,7 +118,7 @@ jobs: mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES" echo "Drop and create database" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;' - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';' + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;' @@ -175,16 +175,14 @@ jobs: set +e echo ' $INSTALL_FORCED_FILE echo '$'force_install_noedit=2';' >> $INSTALL_FORCED_FILE - # For mysql - echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE - #echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE + #echo '$'force_install_type=\'mysqli\'';' >> $INSTALL_FORCED_FILE + echo '$'force_install_type=\'pgsql\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_dbserver=\'127.0.0.1\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_database=\'travis\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_databaselogin=\'root\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_databasepass=\'password\'';' >> $INSTALL_FORCED_FILE - # For mysql - echo '$'force_install_port=\'32574\'';' >> $INSTALL_FORCED_FILE - #echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE + #echo '$'force_install_port=\'32574\'';' >> $INSTALL_FORCED_FILE + echo '$'force_install_port=\'5432\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE diff --git a/.github/workflows/github_ci_php81_mysql.yml b/.github/workflows/github_ci_php81_mysql.yml index a449d1072b8..5e76635cb15 100644 --- a/.github/workflows/github_ci_php81_mysql.yml +++ b/.github/workflows/github_ci_php81_mysql.yml @@ -96,7 +96,7 @@ jobs: mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SHOW DATABASES" echo "Drop and create database" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'DROP DATABASE IF EXISTS travis;' - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';' + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password';" mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e 'FLUSH PRIVILEGES;'