From 6fccc1939488cc802e309ddc3923546a7295aeab Mon Sep 17 00:00:00 2001 From: jmsche Date: Mon, 7 Aug 2023 11:47:27 +0200 Subject: [PATCH 1/5] MariaDB as service in GitHub workflow --- .github/workflows/continuous-integration.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 3c4306a..1bd1d9c 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -15,6 +15,15 @@ jobs: env: SYMFONY_DEPRECATIONS_HELPER: disabled + services: + mariadb: + image: mariadb:10.6 + env: + MARIADB_ROOT_PASSWORD: root + ports: + - 3307:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + strategy: matrix: php-version: @@ -40,9 +49,6 @@ jobs: with: composer-options: "--ignore-platform-reqs" - - name: Start mariadb - run: docker-compose -f docker-compose.test.yaml up -d mariadb - - name: Start other Docker services run: docker-compose -f docker-compose.test.yaml up -d minio createbuckets ftpserver @@ -62,8 +68,5 @@ jobs: - name: Stop other Docker services run: docker-compose -f docker-compose.test.yaml stop createbuckets minio ftpserver - - name: Stop mariadb - run: docker-compose -f docker-compose.test.yaml stop mariadb - - name: Upload to Codecov uses: codecov/codecov-action@v3 From a9209acd0d4dd3ab9911f5e24ec877133061b188 Mon Sep 17 00:00:00 2001 From: jmsche Date: Mon, 7 Aug 2023 11:55:07 +0200 Subject: [PATCH 2/5] Load data fixtures in a separate test database --- .github/workflows/continuous-integration.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 1bd1d9c..ac948f3 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -49,7 +49,7 @@ jobs: with: composer-options: "--ignore-platform-reqs" - - name: Start other Docker services + - name: Start Docker services run: docker-compose -f docker-compose.test.yaml up -d minio createbuckets ftpserver - name: Load Doctrine fixtures @@ -60,12 +60,18 @@ jobs: bin/console doctrine:schema:validate --env=test bin/console app:fixtures:load --env=test + - name: Load data fixtures in another test database + run: | + mysql -uroot -proot -e "DROP DATABASE IF EXISTS test_db"; + mysql -uroot -proot -e "CREATE DATABASE test_db"; + mysql -uroot -proot test_db < src/Faker/Provider/fixture.sql + - name: Run PHPUnit with deprecations disabled run: vendor/bin/phpunit --coverage-clover=coverage.xml env: SYMFONY_DEPRECATIONS_HELPER: disabled - - name: Stop other Docker services + - name: Stop Docker services run: docker-compose -f docker-compose.test.yaml stop createbuckets minio ftpserver - name: Upload to Codecov From 70d3f7089a4bee148fb3ae141bbb8f9faf004a88 Mon Sep 17 00:00:00 2001 From: jmsche Date: Mon, 7 Aug 2023 11:55:52 +0200 Subject: [PATCH 3/5] Fix port --- .github/workflows/continuous-integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ac948f3..8d7ab79 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -62,9 +62,9 @@ jobs: - name: Load data fixtures in another test database run: | - mysql -uroot -proot -e "DROP DATABASE IF EXISTS test_db"; - mysql -uroot -proot -e "CREATE DATABASE test_db"; - mysql -uroot -proot test_db < src/Faker/Provider/fixture.sql + mysql -uroot -proot --port 3307 -e "DROP DATABASE IF EXISTS test_db"; + mysql -uroot -proot --port 3307 -e "CREATE DATABASE test_db"; + mysql -uroot -proot --port 3307 test_db < src/Faker/Provider/fixture.sql - name: Run PHPUnit with deprecations disabled run: vendor/bin/phpunit --coverage-clover=coverage.xml From 69c0458421c01d7fa4f902d8895da4dd8af9f08d Mon Sep 17 00:00:00 2001 From: jmsche Date: Mon, 7 Aug 2023 11:58:16 +0200 Subject: [PATCH 4/5] Fix port --- .github/workflows/continuous-integration.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 8d7ab79..cf0a696 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -62,9 +62,9 @@ jobs: - name: Load data fixtures in another test database run: | - mysql -uroot -proot --port 3307 -e "DROP DATABASE IF EXISTS test_db"; - mysql -uroot -proot --port 3307 -e "CREATE DATABASE test_db"; - mysql -uroot -proot --port 3307 test_db < src/Faker/Provider/fixture.sql + mysql -uroot -proot --port=3307 -e "DROP DATABASE IF EXISTS test_db"; + mysql -uroot -proot --port=3307 -e "CREATE DATABASE test_db"; + mysql -uroot -proot --port=3307 test_db < src/Faker/Provider/fixture.sql - name: Run PHPUnit with deprecations disabled run: vendor/bin/phpunit --coverage-clover=coverage.xml From 65e90ce8de8a54a018fe857e7d66636da3cf0c0f Mon Sep 17 00:00:00 2001 From: jmsche Date: Mon, 7 Aug 2023 12:00:48 +0200 Subject: [PATCH 5/5] Specify host --- .github/workflows/continuous-integration.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index cf0a696..d954ace 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -34,6 +34,12 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Load data fixtures in another test database + run: | + mysql --host=mariadb -uroot -proot --port=3307 -e "DROP DATABASE IF EXISTS test_db"; + mysql --host=mariadb -uroot -proot --port=3307 -e "CREATE DATABASE test_db"; + mysql --host=mariadb -uroot -proot --port=3307 test_db < src/Faker/Provider/fixture.sql + - name: Install PHP uses: shivammathur/setup-php@v2 with: @@ -60,12 +66,6 @@ jobs: bin/console doctrine:schema:validate --env=test bin/console app:fixtures:load --env=test - - name: Load data fixtures in another test database - run: | - mysql -uroot -proot --port=3307 -e "DROP DATABASE IF EXISTS test_db"; - mysql -uroot -proot --port=3307 -e "CREATE DATABASE test_db"; - mysql -uroot -proot --port=3307 test_db < src/Faker/Provider/fixture.sql - - name: Run PHPUnit with deprecations disabled run: vendor/bin/phpunit --coverage-clover=coverage.xml env: