Skip to content

Commit

Permalink
try to fix test pipeline 01
Browse files Browse the repository at this point in the history
  • Loading branch information
lukadschaak committed Jun 9, 2023
1 parent ab991ea commit dbe214a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/test-and-qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ jobs:
runs-on: ubuntu-latest
# from https://ldarren.medium.com/number-of-ways-to-setup-database-in-github-actions-2cd48df9faae
services:
db:
image: mariadb:10.10.2
database:
image: mariadb:10.5.13
env:
MYSQL_ROOT_PASSWORD: 'pimcore'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_DATABASE: 'pimcore_test'
MYSQL_USER: 'pimcore'
MYSQL_PASSWORD: 'pimcore'
MYSQL_USER: 'pimcore'
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
ports:
- 3306:3306
Expand All @@ -71,5 +71,5 @@ jobs:
- name: Execute tests (Unit and Feature tests) via PHPUnit
run: composer tests
env:
DB_URL: 'mysql://pimcore:pimcore@127.0.0.1:3306/pimcore_test?serverVersion=mariadb-10.10.2'
DB_URL: 'mysql://pimcore:pimcore@127.0.0.1:3306/pimcore_test?serverVersion=mariadb-10.5.13'

9 changes: 6 additions & 3 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
x-php: &php
image: pimcore/pimcore:php8.1.17-v1.3
environment:
MYSQL_DATABASE: 'pimcore_test'
volumes:
- ./:/var/www/html

Expand All @@ -12,10 +14,11 @@ services:
--character-set-server=utf8mb4
--collation-server=utf8mb4_unicode_ci
environment:
# must fit with .github/workflows/test-and-qa.yaml
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
MYSQL_DATABASE: pimcore
MYSQL_PASSWORD: pimcore
MYSQL_USER: pimcore
MYSQL_DATABASE: 'pimcore_test'
MYSQL_PASSWORD: 'pimcore'
MYSQL_USER: 'pimcore'
tmpfs:
- /tmp
- /var/lib/mysql
Expand Down

0 comments on commit dbe214a

Please sign in to comment.