diff options
| author | Mario <mario@mariovavti.com> | 2024-02-01 16:00:36 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-02-01 16:00:36 +0000 |
| commit | 691de5bf2ed177ee6481743e88a78788d32e1f03 (patch) | |
| tree | 1e267a2a3adefbd56c87194f5afcf03cb9b6f39e | |
| parent | 2e155892fe88c877c226fc5a10402a05c05fe8cd (diff) | |
| parent | 6680c2faf3467a560c61da75d90e92f2436b8967 (diff) | |
| download | volse-hubzilla-691de5bf2ed177ee6481743e88a78788d32e1f03.tar.gz volse-hubzilla-691de5bf2ed177ee6481743e88a78788d32e1f03.tar.bz2 volse-hubzilla-691de5bf2ed177ee6481743e88a78788d32e1f03.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 366c2c448..76dc41334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ variables: # Ignore a Composer warning COMPOSER_ALLOW_SUPERUSER: 1 # Configure MySQL/MariaDB service (https://hub.docker.com/_/mysql/, https://hub.docker.com/_/mariadb/) + DB_HOST: mysql MYSQL_DATABASE: hello_world_test MYSQL_ROOT_PASSWORD: mysql # Configure PostgreSQL service (https://hub.docker.com/_/postgres/) @@ -44,17 +45,17 @@ before_script: .job_template_mysql: &job_definition_mysql stage: test variables: - HZ_TEST_DB_HOST: mysql + HZ_TEST_DB_HOST: $DB_HOST HZ_TEST_DB_TYPE: mysql HZ_TEST_DB_USER: root HZ_TEST_DB_PASS: $MYSQL_ROOT_PASSWORD HZ_TEST_DB_DATABASE: $MYSQL_DATABASE script: # Import hubzilla's DB schema - - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host=mysql "$MYSQL_DATABASE" + - echo "USE $MYSQL_DATABASE; $(cat ./install/schema_mysql.sql)" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host="$DB_HOST" "$MYSQL_DATABASE" # Show databases and relations/tables of hubzilla's 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" + - echo "SHOW DATABASES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host="$DB_HOST" "$MYSQL_DATABASE" + - echo "USE $MYSQL_DATABASE; SHOW TABLES;" | mysql --user=root --password="$MYSQL_ROOT_PASSWORD" --host="$DB_HOST" "$MYSQL_DATABASE" # Run the actual tests - touch dbfail.out - vendor/bin/phpunit --configuration tests/phpunit.xml --verbose --stop-on-error --coverage-text --colors=never --log-junit tests/results/junit.xml || exit_code=$? @@ -101,20 +102,28 @@ before_script: # PHP8.1 with MySQL 8.0 php8.1_mysql8.0.22: - <<: *job_definition_mysql - <<: *artifacts_template image: php:8.1 services: - mysql:8.0 + <<: *job_definition_mysql + <<: *artifacts_template +# PHP8.1 with MariaDB 10.6 +php8.1_mariadb10.6: + image: php:8.1 + services: + - name: mariadb:10.6 + alias: mysql + <<: *job_definition_mysql + <<: *artifacts_template # PHP8.1 with PostgreSQL 12 php8.1_postgres12: - <<: *job_definition_postgres - <<: *artifacts_template image: php:8.1 services: - postgres:12-alpine + <<: *job_definition_postgres + <<: *artifacts_template # Generate Doxygen API Documentation and deploy it as GitLab pages |