From: Alexis Romero <alexis.romero@open-xchange.com>
Date: Mon, 13 Feb 2023 14:49:45 +0000 (+0100)
Subject: gh actions: added manual removal/installation of odbc packages
X-Git-Tag: dnsdist-1.8.0-rc1~26^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60370ceb3319526dc1887f578c0164c8f6728b81;p=thirdparty%2Fpdns.git

gh actions: added manual removal/installation of odbc packages
---

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index f4991a2473..09e5957501 100644
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -38,6 +38,9 @@ jobs:
           key: auth-ccache-${{ steps.get-stamp.outputs.stamp }}
           restore-keys: auth-ccache-
       - run: build-scripts/gh-actions-setup-inv  # this runs apt update+upgrade
+      # FIXME: Workaround to avoid getting buggy version for unixodbc-dev from Microsoft repo
+      - run: "sudo apt-get remove unixodbc odbcinst odbcinst1debian2 libodbc1 unixodbc-dev"
+      - run: "sudo apt-get install unixodbc=2.3.6-0.1build1 odbcinst=2.3.6-0.1build1 odbcinst1debian2=2.3.6-0.1build1 libodbc1=2.3.6-0.1build1 unixodbc-dev=2.3.6-0.1build1"
       - run: inv install-clang
       - run: inv install-auth-build-deps
       - run: inv ci-autoconf
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e86e53a97d..3e0cf03bb8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -102,8 +102,14 @@ jobs:
                 libsystemd-dev \
                 libwslay-dev \
                 libyaml-cpp-dev \
-                ragel \
-                unixodbc-dev
+                ragel
+
+    # FIXME: Workaround to avoid getting buggy version for unixodbc-dev from Microsoft repo
+    - name: Remove current package version and dependencies for ODBC
+      run: sudo apt-get remove unixodbc odbcinst odbcinst1debian2 libodbc1 unixodbc-dev
+
+    - name: Install fixed version 2.3.6 of ODBC packages
+      run: sudo apt-get install unixodbc=2.3.6-0.1build1 odbcinst=2.3.6-0.1build1 odbcinst1debian2=2.3.6-0.1build1 libodbc1=2.3.6-0.1build1 unixodbc-dev=2.3.6-0.1build1
 
     - name: Build auth
       if: matrix.product == 'auth'
diff --git a/tasks.py b/tasks.py
index 554318ec73..1c85df1360 100644
--- a/tasks.py
+++ b/tasks.py
@@ -45,7 +45,7 @@ auth_build_deps = [    # FIXME: perhaps we should be stealing these from the deb
     'ruby-bundler',
     'ruby-dev',
     'sqlite3',
-    'unixodbc-dev',
+    # 'unixodbc-dev',
 ]
 rec_build_deps = [
     'libcap-dev',