[libgda] MariaDB: if no MySQL use it instead



commit 6a4b8d3995437265cb831b27ac82e60e108b05bd
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Jan 30 20:42:20 2021 -0600

    MariaDB: if no MySQL use it instead
    
    CI was updated to use mariadb instead of mysql

 .gitlab-ci.yml | 10 ++++++++--
 meson.build    |  4 ++++
 2 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2513e2660..4bf257891 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ variables:
                 meson ninja-build
                 libgtk-3-dev libxml2-dev gnome-common
                 libsqlite3-dev
-                gobject-introspection libssl-dev libmysqlclient-dev
+                gobject-introspection libssl-dev
                 libldap2-dev libpq-dev
                 libgtksourceview-3.0-dev
                 libgdk-pixbuf2.0-dev
@@ -68,6 +68,7 @@ before_script:
 library_build:
   stage: build
   script:
+  - apt -y install libmysqlclient-dev
   - export PGPASSWORD=$POSTGRES_PASSWORD
   - meson --prefix=/usr --buildtype=debug -Dgtk_doc=true --werror _build
   - cd _build
@@ -86,9 +87,14 @@ library_build:
     - _build/doc/Gdaui-6.0
     expire_in: 1 week
 
-paralel_build:
+mariadb_build:
+  variables:
+    MYSQL_HOST: mariadb
+    MYSQL_CNC_PARAMS: 
"DB_NAME=$MYSQL_DATABASE;HOST=$MYSQL_HOST;USERNAME=$MYSQL_USER;PASSWORD=$MYSQL_ROOT_PASSWORD"
+    MYSQL_META_CNC: 
"DB_NAME=$MYSQL_DATABASE;HOST=$MYSQL_HOST;USERNAME=$MYSQL_USER;PASSWORD=$MYSQL_ROOT_PASSWORD"
   stage: build
   script:
+  - apt -y install libmariadbclient-dev
   - export PGPASSWORD=$POSTGRES_PASSWORD
   - psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "SELECT 'OK' AS status;"
   - meson --prefix=/usr --buildtype=debug -Dgtk_doc=true --werror _build
diff --git a/meson.build b/meson.build
index d13bcc7c3..6b70a7771 100644
--- a/meson.build
+++ b/meson.build
@@ -65,6 +65,10 @@ libxslt_dep = dependency('libxslt', required: false)
 jsonglib_dep = dependency('json-glib-1.0',required : false)
 postgres_dep = dependency ('libpq', required: false)
 mysql_dep = dependency ('mysqlclient', required: false)
+if not mysql_dep.found()
+mysql_dep = dependency ('libmariadb', required: false)
+endif
+
 mysql_args = []
 if mysql_dep.found ()
 if mysql_dep.version ().version_compare ('>21.0.0')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]