From 9f930bd757d998fbcf2ae399201549657f678ea6 Mon Sep 17 00:00:00 2001 From: Alexis Romero Date: Fri, 24 Feb 2023 11:24:26 +0100 Subject: [PATCH] Avoid Microsoft repo for ODBC. Step 3: unixodbc install cleanup --- .github/workflows/build-and-test-all.yml | 3 --- .github/workflows/codeql-analysis.yml | 10 ++-------- .github/workflows/misc-dailies.yml | 3 --- tasks.py | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml index d20753661b..8820e03b52 100644 --- a/.github/workflows/build-and-test-all.yml +++ b/.github/workflows/build-and-test-all.yml @@ -39,9 +39,6 @@ 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 5cf1a90dce..ae8c7d0602 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -103,14 +103,8 @@ jobs: libsystemd-dev \ libwslay-dev \ libyaml-cpp-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 + ragel \ + unixodbc-dev - name: Build auth if: matrix.product == 'auth' diff --git a/.github/workflows/misc-dailies.yml b/.github/workflows/misc-dailies.yml index 329a0bbda9..0b1e70e623 100644 --- a/.github/workflows/misc-dailies.yml +++ b/.github/workflows/misc-dailies.yml @@ -52,9 +52,6 @@ jobs: fetch-depth: 5 submodules: recursive - 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 install-coverity-tools PowerDNS diff --git a/tasks.py b/tasks.py index 0e760284be..36f39a1e09 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', -- 2.47.2