diff --git a/.github/workflows/github_ci_php71_pgsql.yml b/.github/workflows/github_ci_php71_pgsql.yml index f693387958a..856e2eb18a5 100644 --- a/.github/workflows/github_ci_php71_pgsql.yml +++ b/.github/workflows/github_ci_php71_pgsql.yml @@ -116,18 +116,19 @@ jobs: mysql --version | head - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head - 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 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;' - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" - #psql -c 'create database travis;' -U postgres - #psql travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql - #pgloader mysql://root:pass@127.0.0.1:32574/dolibarr_src postgresql://dolibarrowner:dolibarrownerpass@127.0.0.1/dolibarr_dest + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql + + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" + + echo "Init postgresql database" ps fauxww | grep postgres ls /etc/postgresql/14/main/ sudo chmod -R a+rwx /etc/postgresql/14/main/pg_hba.conf @@ -143,10 +144,12 @@ jobs: sudo mkdir -p /tmp/pgloader sudo chmod -R a+rwx /tmp/pgloader/ + echo sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis sudo pgloader mysql://root:password@127.0.0.1:32574/travis postgresql://postgres:postgres@127.0.0.1:5432/travis echo 'ALTER SEQUENCE llx_accountingaccount_rowid_seq RENAME TO llx_accounting_account_rowid_seq' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis echo 'ALTER SEQUENCE llx_accounting_account_rowid_seq RESTART WITH 1000001;' | psql postgresql://postgres:postgres@127.0.0.1:5432/travis + # Create pgsql compatibility functions psql postgresql://postgres:postgres@127.0.0.1:5432/travis < htdocs/install/pgsql/functions/functions.sql diff --git a/.github/workflows/github_ci_php81_mysql.yml b/.github/workflows/github_ci_php81_mysql.yml index f475ce0c930..c1f78f2033a 100644 --- a/.github/workflows/github_ci_php81_mysql.yml +++ b/.github/workflows/github_ci_php81_mysql.yml @@ -46,6 +46,8 @@ jobs: sudo update-alternatives --set php /usr/bin/php8.1 php -i | head - + cd $GITHUB_WORKSPACE + ls $GITHUB_WORKSPACE composer -n require --ignore-platform-reqs phpunit/phpunit ^8 \ php-parallel-lint/php-parallel-lint ^1.2 \ php-parallel-lint/php-console-highlighter ^0 \ @@ -94,13 +96,16 @@ jobs: mysql --version | head - mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -e "SELECT VERSION();" | head - 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 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;' + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql + mysql --host 127.0.0.1 --port 32574 -uroot -ppassword -D travis -e "UPDATE llx_const set value = '0666' WHERE name = 'MAIN_UMASK';" - name: Generate Dolibarr conf file @@ -128,16 +133,12 @@ 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_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_prefix=\'llx_\'';' >> $INSTALL_FORCED_FILE echo '$'force_install_createdatabase=false';' >> $INSTALL_FORCED_FILE echo '$'force_install_createuser=false';' >> $INSTALL_FORCED_FILE