diff --git a/.circleci/config.yml b/.circleci/config.yml index bc915a40d..5c3149c9f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,6 +73,10 @@ jobs: environment: <<: *mysql_env MYSQL_TCP_PORT: 3308 + - image: circleci/mariadb + environment: + <<: *mysql_env + MYSQL_TCP_PORT: 4306 - image: circleci/postgres:10.0 environment: POSTGRES_DB: test @@ -105,6 +109,7 @@ jobs: -wait tcp://localhost:3306 -wait tcp://localhost:3307 -wait tcp://localhost:3308 + -wait tcp://localhost:4306 -wait tcp://localhost:5430 -wait tcp://localhost:5431 -wait tcp://localhost:5433 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7db0dab60..a179a35f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -115,6 +115,19 @@ jobs: --health-start-period 10s --health-timeout 5s --health-retries 10 + maria: + image: mariadb + env: + MYSQL_DATABASE: test + MYSQL_ROOT_PASSWORD: pass + ports: + - 4306:3306 + options: >- + --health-cmd "mysqladmin ping -ppass" + --health-interval 10s + --health-start-period 10s + --health-timeout 5s + --health-retries 10 postgres10: image: postgres:10 env: @@ -228,6 +241,19 @@ jobs: --health-start-period 10s --health-timeout 5s --health-retries 10 + maria: + image: mariadb + env: + MYSQL_DATABASE: test + MYSQL_ROOT_PASSWORD: pass + ports: + - 4306:3306 + options: >- + --health-cmd "mysqladmin ping -ppass" + --health-interval 10s + --health-start-period 10s + --health-timeout 5s + --health-retries 10 postgres10: image: postgres:10 env: