[libgda] Revert "MariaDB: if no MySQL use it instead"



commit b97278bb914f3789c62e923bb1578f86eb433a70
Author: Daniel Espinosa <esodan gmail com>
Date:   Sat Jan 30 21:19:22 2021 -0600

    Revert "MariaDB: if no MySQL use it instead"
    
    This reverts commit 6a4b8d3995437265cb831b27ac82e60e108b05bd.
    
    MariaDB 10 is not source compatible with current mysql provider
    so reverting

 .gitlab-ci.yml | 10 ++--------
 meson.build    |  4 ----
 2 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4bf257891..2513e2660 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
+                gobject-introspection libssl-dev libmysqlclient-dev
                 libldap2-dev libpq-dev
                 libgtksourceview-3.0-dev
                 libgdk-pixbuf2.0-dev
@@ -68,7 +68,6 @@ 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
@@ -87,14 +86,9 @@ library_build:
     - _build/doc/Gdaui-6.0
     expire_in: 1 week
 
-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"
+paralel_build:
   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 6b70a7771..d13bcc7c3 100644
--- a/meson.build
+++ b/meson.build
@@ -65,10 +65,6 @@ 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]