From cec2ef520dbca62675548a5f455a801c1a54a0d9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 26 Jun 2023 21:00:14 +0200 Subject: [PATCH] Test CI --- .github/workflows/github_ci_php71_pgsql.yml | 13 ++++++------- .github/workflows/github_ci_php81_mysql.yml | 1 + .travis.yml | 4 ++-- htdocs/install/mysql/migration/5.0.0-6.0.0.sql | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/github_ci_php71_pgsql.yml b/.github/workflows/github_ci_php71_pgsql.yml index 27bb317e7aa..7802c5a2d2a 100644 --- a/.github/workflows/github_ci_php71_pgsql.yml +++ b/.github/workflows/github_ci_php71_pgsql.yml @@ -160,11 +160,11 @@ jobs: echo '$'dolibarr_main_data_root=\'/var/www/html/documents\'';' >> $CONF_FILE echo '$'dolibarr_main_db_host=\'127.0.0.1\'';' >> $CONF_FILE echo '$'dolibarr_main_db_name=\'travis\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_user=\'root\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_pass=\'password\'';' >> $CONF_FILE + echo '$'dolibarr_main_db_user=\'postgres\'';' >> $CONF_FILE + echo '$'dolibarr_main_db_pass=\'postgres\'';' >> $CONF_FILE echo '$'dolibarr_main_instance_unique_id=\'travis1234567890\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_type=\'mysqli\'';' >> $CONF_FILE - echo '$'dolibarr_main_db_port=\'32574\'';' >> $CONF_FILE + echo '$'dolibarr_main_db_type=\'pgsql\'';' >> $CONF_FILE + echo '$'dolibarr_main_db_port=\'5432\'';' >> $CONF_FILE echo '$'dolibarr_main_authentication=\'dolibarr\'';' >> $CONF_FILE cat $CONF_FILE - name: Generate install.forced.php file to test installation @@ -179,9 +179,8 @@ jobs: 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 - #echo '$'force_install_port=\'32574\'';' >> $INSTALL_FORCED_FILE + echo '$'force_install_databaselogin=\'postgres\'';' >> $INSTALL_FORCED_FILE + echo '$'force_install_databasepass=\'postgres\'';' >> $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 diff --git a/.github/workflows/github_ci_php81_mysql.yml b/.github/workflows/github_ci_php81_mysql.yml index c1b0bbfb857..f475ce0c930 100644 --- a/.github/workflows/github_ci_php81_mysql.yml +++ b/.github/workflows/github_ci_php81_mysql.yml @@ -102,6 +102,7 @@ jobs: 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 run: | export CONF_FILE=$GITHUB_WORKSPACE/htdocs/conf/conf.php diff --git a/.travis.yml b/.travis.yml index e5bd9e3d808..c17d8b632bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -434,8 +434,8 @@ script: php step5.php 17.0.0 18.0.0 > $TRAVIS_BUILD_DIR/upgrade17001800-3.log #show table content and log - #echo '\d llx_bank_account' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' - #cat $TRAVIS_BUILD_DIR/upgrade500600.log + echo '\d llx_adherent' | psql 'postgresql://postgres:postgres@127.0.0.1:5432/travis' + cat $TRAVIS_BUILD_DIR/upgrade500600.log - | echo Result of migration scripts diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql index cdd6ab93d61..8b62d48c65b 100644 --- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql +++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql @@ -141,6 +141,7 @@ ALTER TABLE llx_bank ADD COLUMN numero_compte varchar(32) NULL; -- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN state_id integer DEFAULT NULL; -- VPGSQL8.2 ALTER TABLE llx_adherent MODIFY COLUMN state_id integer USING state_id::integer; -- VMYSQL4.1 ALTER TABLE llx_adherent MODIFY COLUMN country integer DEFAULT NULL; +-- VPGSQL8.2 ALTER TABLE llx_adherent ALTER COLUMN country DROP DEFAULT; -- VPGSQL8.2 ALTER TABLE llx_adherent MODIFY COLUMN country integer USING country::integer; INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) VALUES ('PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30);