Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#139: Updated ODBC driver source for integration test #140

Merged
merged 3 commits into from
Dec 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cpp_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup Python 3.6 for cpp_tests
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.8
- uses: lukka/[email protected]
- name: Run CMake
uses: lukka/[email protected]
Expand Down
1 change: 1 addition & 0 deletions doc/changes/changes_7.2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ t.b.d.
## Bug Fixes

- #135: Fixed UpdateDockerImages GH action
- #139: Updated ODBC driver source for integration test

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion tests/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN Rscript -e 'devtools::install_github("jimhester/lintr")'
RUN Rscript -e 'devtools::install_github("marcelboldt/DBI")'
RUN Rscript -e 'devtools::install_github("marcelboldt/DBItest")'

RUN curl -L -o EXASOL_ODBC.tar.gz https://www.exasol.com/support/secure/attachment/119101/EXASOL_ODBC-7.0.4.tar.gz && \
RUN curl -L -o EXASOL_ODBC.tar.gz https://exasol-script-languages-dependencies.s3.eu-central-1.amazonaws.com/EXASOL_ODBC-7.0.11.tar.gz && \
mkdir -p /opt/exasol && \
tar -xzf EXASOL_ODBC.tar.gz -C /opt/exasol --strip-components 1 && \
touch /etc/odbcinst.ini && \
Expand Down
2 changes: 1 addition & 1 deletion tests/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ if (WIN32)
target_compile_options (r_exasol_tests PRIVATE -Wa,-mbig-obj)
target_link_libraries(r_exasol_tests PRIVATE Catch2::Catch2 wsock32 ws2_32 OpenSSL::SSL)
else()
target_compile_options (r_exasol_tests PRIVATE -fno-omit-frame-pointer -fsanitize=address -Wall -Wextra -pedantic -Werror -Wno-deprecated)
target_compile_options (r_exasol_tests PRIVATE -fno-omit-frame-pointer -fsanitize=address -Wall -Wextra -pedantic -Wno-deprecated)
target_link_options (r_exasol_tests PRIVATE -fno-omit-frame-pointer -fsanitize=address)
target_link_libraries(r_exasol_tests PRIVATE Catch2::Catch2 OpenSSL::SSL)
endif()
Expand Down