From e9a50371f5dd4cffb0ba4894f2286b28e8f535b9 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 08:30:06 +0000 Subject: comment out xdebug --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c06e3151..299ea0228 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,8 +34,8 @@ before_script: # pecl and composer do not work with PHP production restrictions (from Hubzilla Docker image) - if [ -f /usr/local/etc/php/conf.d/z_prod.ini ]; then mv /usr/local/etc/php/conf.d/z_prod.ini /usr/local/etc/php/conf.d/z_prod.ini.off; fi # Install & enable Xdebug for code coverage reports -- pecl install xdebug -- docker-php-ext-enable xdebug +#- pecl install xdebug +#- docker-php-ext-enable xdebug # Install composer - curl -sS https://getcomposer.org/installer | php # Install dev libraries from composer -- cgit v1.2.3 From e236b7781744b8a287845b78857787064b70c4f8 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 08:48:09 +0000 Subject: more psr-4 autoloading standard --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 299ea0228..efe0843a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ before_script: - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text + - vendor/bin/phpunit --configuration Tests/phpunit.xml --coverage-text # hidden job definition with template for PostgreSQL .job_template_postgres: &job_definition_postgres @@ -66,7 +66,7 @@ before_script: #- psql -h "postgres" -U "$POSTGRES_USER" -l #- psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "\dt;" # Run the actual tests - - vendor/bin/phpunit --configuration tests/phpunit-pgsql.xml --testdox + - vendor/bin/phpunit --configuration Tests/phpunit-pgsql.xml --testdox # hidden job definition with artifacts config template .artifacts_template: @@ -74,11 +74,11 @@ before_script: expire_in: 1 week # Gitlab should show the results, but has problems parsing PHPUnit's junit file. reports: - junit: tests/results/junit.xml + junit: Tests/results/junit.xml # Archive test results (coverage, testdox, junit) name: "$CI_COMMIT_REF_SLUG-$CI_JOB_NAME" paths: - - tests/results/ + - Tests/results/ # PHP7.3 with MySQL 5.7 -- cgit v1.2.3 From de054026f25233fe47938c32777605bb900253f3 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 09:26:37 +0000 Subject: try phpunit 9, remove dbunit (not compatible and abandoned), re-enable xdebug --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index efe0843a1..0b3b8eaf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,8 +34,8 @@ before_script: # pecl and composer do not work with PHP production restrictions (from Hubzilla Docker image) - if [ -f /usr/local/etc/php/conf.d/z_prod.ini ]; then mv /usr/local/etc/php/conf.d/z_prod.ini /usr/local/etc/php/conf.d/z_prod.ini.off; fi # Install & enable Xdebug for code coverage reports -#- pecl install xdebug -#- docker-php-ext-enable xdebug +- pecl install xdebug +- docker-php-ext-enable xdebug # Install composer - curl -sS https://getcomposer.org/installer | php # Install dev libraries from composer -- cgit v1.2.3 From 0ec40f00a929fd755368bf6deec88a8d4ebe05ba Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 09:52:24 +0000 Subject: minor adjustion --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b3b8eaf6..6c14eb92c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ before_script: - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - - vendor/bin/phpunit --configuration Tests/phpunit.xml --coverage-text + - vendor/bin/phpunit --configuration Tests/phpunit.xml --coverage-text --migrate-configuration # hidden job definition with template for PostgreSQL .job_template_postgres: &job_definition_postgres -- cgit v1.2.3 From 615424d272c5c8af43852a926dde30455a0e5267 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 10:04:33 +0000 Subject: update ci file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6c14eb92c..0b3b8eaf6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ before_script: - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - - vendor/bin/phpunit --configuration Tests/phpunit.xml --coverage-text --migrate-configuration + - vendor/bin/phpunit --configuration Tests/phpunit.xml --coverage-text # hidden job definition with template for PostgreSQL .job_template_postgres: &job_definition_postgres -- cgit v1.2.3 From 187364d94aacca093f665d43922405424c164b4b Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 10:21:13 +0000 Subject: set xdebug.mode=coverage in php.ini --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b3b8eaf6..094a8843a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,8 @@ before_script: - curl -sS https://getcomposer.org/installer | php # Install dev libraries from composer - php ./composer.phar install --no-progress - +# php.ini settings +- echo 'xdebug.mode=coverage' >> /etc/php/php.ini # hidden job definition with template for MySQL/MariaDB .job_template_mysql: &job_definition_mysql -- cgit v1.2.3 From 138beeac41824394ad9a40e857ae9823e64e066c Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 10:24:00 +0000 Subject: wrong path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 094a8843a..d5477d8f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,7 +41,7 @@ before_script: # Install dev libraries from composer - php ./composer.phar install --no-progress # php.ini settings -- echo 'xdebug.mode=coverage' >> /etc/php/php.ini +- echo 'xdebug.mode=coverage' >> /usr/local/etc/php/php.ini # hidden job definition with template for MySQL/MariaDB .job_template_mysql: &job_definition_mysql -- cgit v1.2.3 From 188975ccbd3a9c584238c35dd8c5a8fda7718199 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 26 Nov 2020 11:20:16 +0000 Subject: update gitlab-ci --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5477d8f2..9578ec6b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,7 +50,7 @@ before_script: - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" - - vendor/bin/phpunit --configuration Tests/phpunit.xml --coverage-text + - vendor/bin/phpunit --configuration tests/phpunit.xml --coverage-text # hidden job definition with template for PostgreSQL .job_template_postgres: &job_definition_postgres @@ -67,7 +67,7 @@ before_script: #- psql -h "postgres" -U "$POSTGRES_USER" -l #- psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "\dt;" # Run the actual tests - - vendor/bin/phpunit --configuration Tests/phpunit-pgsql.xml --testdox + - vendor/bin/phpunit --configuration tests/phpunit-pgsql.xml --testdox # hidden job definition with artifacts config template .artifacts_template: @@ -75,11 +75,11 @@ before_script: expire_in: 1 week # Gitlab should show the results, but has problems parsing PHPUnit's junit file. reports: - junit: Tests/results/junit.xml + junit: tests/results/junit.xml # Archive test results (coverage, testdox, junit) name: "$CI_COMMIT_REF_SLUG-$CI_JOB_NAME" paths: - - Tests/results/ + - tests/results/ # PHP7.3 with MySQL 5.7 -- cgit v1.2.3