diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c6aeaeb16b95c850ee3437285717bb6a793897f..e9c66d1f085ae9d8741fa3851c2e4fd6f7dc048c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,18 +202,11 @@ default: _TARGET_PHP: "8.3" _TARGET_DB: "sqlite-3" -# Run daily, or manually. -# 'PHP 8.1 MariaDB 10.3.22': -# <<: [ *default-stage, *run-daily ] -# variables: -# _TARGET_PHP: "8.1" -# _TARGET_DB: "mariadb-10.3.22" - -# 'PHP 8.1 MySQL 5.7 with updated deps': -# <<: [ *default-stage, *run-daily ] -# variables: -# _TARGET_PHP: "8.1" -# _TARGET_DB: "mysql-5.7" +'PHP 8.1 MariaDB 10.3.22': + <<: [ *default-stage, *run-daily ] + variables: + _TARGET_PHP: "8.1" + _TARGET_DB: "mariadb-10.3.22" 'PHP 8.1 PostgreSQL 14.1': <<: [ *default-stage, *run-daily ] diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml index 370b430729dcb1ad9dfe831a6c6640aa0766c690..1cd72bf1781b53c8cfbf8d7607a8760b8639d49f 100644 --- a/.gitlab-ci/pipeline.yml +++ b/.gitlab-ci/pipeline.yml @@ -25,6 +25,7 @@ default: [[ $_TARGET_DB == mysql* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql [[ $_TARGET_DB == mariadb* ]] && export SIMPLETEST_DB=mysql://$MYSQL_USER:$MYSQL_PASSWORD@database/$MYSQL_DATABASE?module=mysql [[ $_TARGET_DB == pgsql* ]] && export SIMPLETEST_DB=pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@database/$POSTGRES_DB?module=pgsql + - echo "SIMPLETEST_DB = $SIMPLETEST_DB" - $CI_PROJECT_DIR/.gitlab-ci/scripts/server-setup.sh after_script: - sed -i "s#$CI_PROJECT_DIR/##" ./sites/default/files/simpletest/phpunit-*.xml || true