From 60370ceb3319526dc1887f578c0164c8f6728b81 Mon Sep 17 00:00:00 2001 From: Alexis Romero Date: Mon, 13 Feb 2023 15:49:45 +0100 Subject: [PATCH] gh actions: added manual removal/installation of odbc packages --- .github/workflows/build-and-test-all.yml | 3 +++ .github/workflows/codeql-analysis.yml | 10 ++++++++-- tasks.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index f4991a2473fe..09e5957501de 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 e86e53a97dc7..3e0cf03bb893 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 554318ec7365..1c85df1360d5 100644 --- a/tasks.py +++ b/tasks.py @@ -45,7 +45,7 @@ 'ruby-bundler', 'ruby-dev', 'sqlite3', - 'unixodbc-dev', + # 'unixodbc-dev', ] rec_build_deps = [ 'libcap-dev',