Skip to content

Commit

Permalink
chore: test build without federated auth
Browse files Browse the repository at this point in the history
  • Loading branch information
karenc-bq committed Nov 29, 2024
1 parent 83e187b commit 1be1f1f
Show file tree
Hide file tree
Showing 13 changed files with 3 additions and 1,223 deletions.
11 changes: 3 additions & 8 deletions .github/workflows/build-installer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Build installer
on:
workflow_dispatch:
push:
branches:
- build/older-glibc-version

env:
BUILD_TYPE: Release
Expand Down Expand Up @@ -30,10 +33,6 @@ jobs:
run: |
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64.tar.xz -o mysql.tar.gz
tar xf mysql.tar.gz
curl -L https://github.com/openssl/openssl/releases/download/openssl-3.3.1/openssl-3.3.1.tar.gz -o openssl-3.3.1.tar.gz
tar xzvf openssl-3.3.1.tar.gz
cd openssl-3.3.1
./Configure
- name: Build and install AWS SDK C++
working-directory: ./scripts
Expand All @@ -54,10 +53,6 @@ jobs:
-DCONNECTOR_PLATFORM=linux
-DMYSQL_DIR=./mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64/
-DBUNDLE_DEPENDENCIES=true
-DOPENSSL_INCLUDE_DIR=./openssl-3.3.1/include/

- name: Setup tmate session
uses: mxschmitt/action-tmate@v3

# Build driver
- name: Build driver
Expand Down
28 changes: 0 additions & 28 deletions driver/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
SET(DRIVER_NAME_STATIC "awsmysqlodbc${CONNECTOR_DRIVER_TYPE_SHORT}-static")

SET(DRIVER_SRCS
adfs_proxy.cc
auth_util.cc
aws_sdk_helper.cc
base_metrics_holder.cc
Expand Down Expand Up @@ -94,14 +93,11 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
my_stmt.cc
mylog.cc
mysql_proxy.cc
okta_proxy.cc
options.cc
parse.cc
prepare.cc
query_parsing.cc
results.cc
saml_http_client.cc
saml_util.cc
secrets_manager_proxy.cc
topology_service.cc
transact.cc
Expand All @@ -127,7 +123,6 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/driver/driver.def.cmake ${CMAKE_SOURCE_DIR}/driver/driver${CONNECTOR_DRIVER_TYPE_SHORT}.def @ONLY)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/driver/driver.rc.cmake ${CMAKE_SOURCE_DIR}/driver/driver${CONNECTOR_DRIVER_TYPE_SHORT}.rc @ONLY)
SET(DRIVER_SRCS ${DRIVER_SRCS} driver${CONNECTOR_DRIVER_TYPE_SHORT}.def driver${CONNECTOR_DRIVER_TYPE_SHORT}.rc
adfs_proxy.h
auth_util.h
aws_sdk_helper.h
base_metrics_holder.h
Expand All @@ -152,11 +147,8 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
mylog.h
mysql_proxy.h
myutil.h
okta_proxy.h
parse.h
query_parsing.h
saml_http_client.h
saml_util.h
secrets_manager_proxy.h
topology_service.h
../MYODBC_MYSQL.h ../MYODBC_CONF.h ../MYODBC_ODBC.h)
Expand Down Expand Up @@ -301,26 +293,6 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})

MATH(EXPR DRIVER_INDEX "${DRIVER_INDEX} + 1")

#------------DEPENDENCIES FOR FEDERATED AUTH---------
include(FetchContent)

FetchContent_Declare(
json
URL https://github.com/nlohmann/json/releases/download/v3.10.5/json.tar.xz
)

FetchContent_Declare(
httplib
URL https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.16.1.zip
)

FetchContent_MakeAvailable(httplib json)

TARGET_INCLUDE_DIRECTORIES(${DRIVER_NAME} PUBLIC "${httplib_SOURCE_DIR}" ${OPENSSL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(${DRIVER_NAME} nlohmann_json::nlohmann_json)
TARGET_INCLUDE_DIRECTORIES(${DRIVER_NAME_STATIC} PUBLIC "${httplib_SOURCE_DIR}" ${OPENSSL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(${DRIVER_NAME_STATIC} nlohmann_json::nlohmann_json)

#------------AWS SDK------------------
LIST(APPEND SERVICE_LIST rds secretsmanager sts aws-c-compression aws-c-sdkutils)

Expand Down
265 changes: 0 additions & 265 deletions driver/adfs_proxy.cc

This file was deleted.

Loading

0 comments on commit 1be1f1f

Please sign in to comment.