From 9860cfc2d884d75ea7c5e5e3bcae28904075aadf Mon Sep 17 00:00:00 2001
From: Ariel Mashraki <7413593+a8m@users.noreply.github.com>
Date: Sun, 20 Dec 2020 21:38:39 +0200
Subject: [PATCH] ci: add mariadb 10.2 to integration (#1068)

---
 .circleci/config.yml     |  6 ++++++
 .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c3149c9f..fc9590d8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -77,6 +77,11 @@ jobs:
         environment:
           <<: *mysql_env
           MYSQL_TCP_PORT: 4306
+      - image: docker.io/bitnami/mariadb:10.2-debian-10
+        environment:
+          MARIADB_DATABASE: test
+          MARIADB_ROOT_PASSWORD: pass
+          MARIADB_PORT_NUMBER: 4307
       - image: circleci/postgres:10.0
         environment:
           POSTGRES_DB: test
@@ -110,6 +115,7 @@ jobs:
             -wait tcp://localhost:3307
             -wait tcp://localhost:3308
             -wait tcp://localhost:4306
+            -wait tcp://localhost:4307
             -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 a179a35f2..11e572d98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -128,6 +128,19 @@ jobs:
           --health-start-period 10s
           --health-timeout 5s
           --health-retries 10
+      maria102:
+        image: mariadb:10.2.32
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: pass
+        ports:
+          - 4307: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:
@@ -254,6 +267,19 @@ jobs:
           --health-start-period 10s
           --health-timeout 5s
           --health-retries 10
+      maria102:
+        image: mariadb:10.2.32
+        env:
+          MYSQL_DATABASE: test
+          MYSQL_ROOT_PASSWORD: pass
+        ports:
+          - 4307: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: