Skip to content

Commit

Permalink
gh actions: added manual removal/installation of odbc packages
Browse files Browse the repository at this point in the history
  • Loading branch information
romeroalx committed Feb 13, 2023
1 parent 83e3222 commit 60370ce
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build-and-test-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
'ruby-bundler',
'ruby-dev',
'sqlite3',
'unixodbc-dev',
# 'unixodbc-dev',
]
rec_build_deps = [
'libcap-dev',
Expand Down

0 comments on commit 60370ce

Please sign in to comment.