From aa2c780427b7d5412a5ed7cf8ef549ceaafa1754 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Mon, 8 Aug 2022 06:14:30 +0300
Subject: [PATCH 62/62] CI: Build fcdb backends

See osdn #44721

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 .github/workflows/ci.yml | 10 +++++++---
 scripts/ci-build.sh      | 10 ++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b02ec589b8..298cde766a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,7 +75,9 @@ jobs:
             sdl2_image \
             sdl2_mixer \
             sdl2_ttf \
-            qt@6
+            qt@6 \
+            mysql-client \
+            unixodbc
       - name: build
         shell: bash
         run: ./scripts/ci-build.sh os_x
@@ -121,7 +123,8 @@ jobs:
             libsdl2-gfx-dev \
             libsdl2-image-dev \
             libsdl2-ttf-dev \
-            libmysqlclient-dev
+            libmysqlclient-dev \
+            unixodbc-dev
       - name: build
         shell: bash
         run: ./scripts/ci-build.sh normal
@@ -219,7 +222,8 @@ jobs:
             libsdl2-gfx-dev \
             libsdl2-image-dev \
             libsdl2-ttf-dev \
-            libmysqlclient-dev
+            libmysqlclient-dev \
+            unixodbc-dev
       - name: build
         shell: bash
         run: ./scripts/ci-build.sh clang_debug
diff --git a/scripts/ci-build.sh b/scripts/ci-build.sh
index 94955daa7f..d5ab19a083 100755
--- a/scripts/ci-build.sh
+++ b/scripts/ci-build.sh
@@ -52,9 +52,9 @@ ninja install
 "os_x")
 # gcc is an alias for clang on OS X
 
-export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$PATH"
-export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include"
-export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib"
+export PATH="$(brew --prefix llvm)/bin:$(brew --prefix gettext)/bin:$(brew --prefix icu4c)/bin:$(brew --prefix qt@6)/bin:$(brew --prefix mysql-client)/bin:$PATH"
+export CPPFLAGS="-I$(brew --prefix gettext)/include -I$(brew --prefix icu4c)/include -I$(brew --prefix qt@6)/include -I$(brew --prefix readline)/include -I$(brew --prefix unixodbc)/include"
+export LDFLAGS="-L$(brew --prefix gettext)/lib -L$(brew --prefix icu4c)/lib -L$(brew --prefix qt@6)/lib -L$(brew --prefix readline)/lib -L$(brew --prefix unixodbc)/lib"
 export PKG_CONFIG_PATH="$(brew --prefix icu4c)/lib/pkgconfig"
 
 export MOCCMD=$(find /usr/local/Cellar/qt -name "moc" | head -n 1)
@@ -68,6 +68,7 @@ cd build
  --enable-sys-lua --with-qtver=qt6 \
  --enable-client=gtk3.22,sdl2,qt,gtk4 \
  --enable-fcmp=gtk3,gtk4,qt,cli \
+ --enable-fcdb=sqlite3,mysql,postgres,odbc \
  --enable-freeciv-manual \
  || (let config_exit_status=$? \
      && echo "Config exit status: $config_exit_status" \
@@ -114,6 +115,7 @@ cd build
  --with-qtver=qt6 \
  --enable-client=gtk3.22,qt,sdl2,gtk4,stub \
  --enable-fcmp=cli,gtk3,qt,gtk4 \
+ --enable-fcdb=sqlite3,mysql,postgres,odbc \
  --enable-freeciv-manual \
  --enable-ai-static=classic,threaded,tex,stub \
  --prefix=${HOME}/freeciv/clang \
@@ -138,10 +140,10 @@ cd build
  --with-qtver=qt6 \
  --enable-client=gtk3.22,qt,sdl2,gtk4,stub \
  --enable-fcmp=cli,gtk3,qt,gtk4 \
+ --enable-fcdb=sqlite3,mysql,postgres,odbc \
  --enable-freeciv-manual \
  --enable-ruledit=experimental \
  --enable-ai-static=classic,threaded,tex,stub \
- --enable-fcdb=sqlite3,mysql \
  --prefix=${HOME}/freeciv/default \
  || (let config_exit_status=$? \
      && echo "Config exit status: $config_exit_status" \
-- 
2.35.1