Avoid Microsoft repo for ODBC. Step 3: unixodbc install cleanup

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index d20753661b40a57fb70394b0723b5e41c4de0e3a..8820e03b52ebd2fcdab9efe54834a2fb6d61ba2f 100644 (file)
--- 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 5cf1a90dce2a87ad0796b663ccfad42016eb8a34..ae8c7d0602865bc1f0199c646ebcfe964412883b 100644 (file)
--- 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 329a0bbda9e8f8a1e1fc01071de5882fbe55d127..0b1e70e62301c15790b4e70aab0cd73ae30d4429 100644 (file)
--- 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 0e760284be7071b9a3d2e10ccbc07e311d27a013..36f39a1e099891b2a197082cae93e1fa84454e58 100644 (file)
--- 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',