Skip to content

Commit 9a2f665

Browse files
karenc-bqkarenc-bq
committed
chore: update github actions to use 8.4.0
1 parent 258358d commit 9a2f665

8 files changed

Lines changed: 108 additions & 109 deletions

File tree

‎.github/workflows/failover.yml‎

Lines changed: 94 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ jobs:
3535
# Configure build environment/dependencies
3636
- name: Install MySQL client libs and include files
3737
run: |
38-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
39-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug-test.zip -o mysql-debug.zip
38+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
39+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug-test.zip -o mysql-debug.zip
4040
unzip -d C:/ mysql.zip
4141
mkdir C:/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug
4242
unzip -d C:/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug mysql-debug.zip
@@ -120,97 +120,97 @@ jobs:
120120
name: windows-failover-results
121121
path: ${{ github.workspace }}/build/unit_testing/Testing/Temporary/LastTest.log
122122

123-
# build-linux:
124-
# name: Linux
125-
# runs-on: ubuntu-latest
126-
# env:
127-
# CMAKE_GENERATOR: Unix Makefiles
128-
# CXX: g++-11
129-
# steps:
130-
# - name: Checkout source code
131-
# uses: actions/checkout@v4
132-
#
133-
# # Configure build environment/dependencies
134-
# - name: Install build dependencies
135-
# run: sudo apt-get update && sudo apt-get install
136-
# g++-11
137-
# build-essential
138-
# libgtk-3-dev
139-
# unixodbc
140-
# unixodbc-dev
141-
# libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev # AWS SDK dependencies
142-
#
143-
# - name: Install MySQL client libs and include files
144-
# run: |
145-
# 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
146-
# tar xf mysql.tar.gz
147-
#
148-
# - name: Cache AWS SDK libraries
149-
# id: cache-dynamic-aws-sdk
150-
# uses: actions/cache@v4
151-
# with:
152-
# path: |
153-
# aws_sdk
154-
# key: ${{ runner.os }}-aws-sdk-dynamic-lib
155-
#
156-
# - name: Build and install AWS SDK C++
157-
# working-directory: ./scripts
158-
# if: steps.cache-dynamic-aws-sdk.outputs.cache-hit != 'true'
159-
# run: |
160-
# ./build_aws_sdk_unix.sh $LINUX_BUILD_TYPE
161-
#
162-
# - name: Create build environment
163-
# shell: bash
164-
# run: cmake -E make_directory ${{ github.workspace }}/build
165-
#
166-
# - name: Configure CMake
167-
# shell: bash
168-
# run: cmake -S . -B build
169-
# -G "$CMAKE_GENERATOR"
170-
# -DCMAKE_BUILD_TYPE=$LINUX_BUILD_TYPE
171-
# -DMYSQLCLIENT_STATIC_LINKING=true
172-
# -DWITH_UNIXODBC=1
173-
# -DCONNECTOR_PLATFORM=linux
174-
# -DMYSQL_DIR=./mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64/
175-
# -DENABLE_UNIT_TESTS=TRUE
176-
# -DENABLE_INTEGRATION_TESTS=FALSE
177-
#
178-
# - name: copy AWS SDK libraries to driver library
179-
# run: |
180-
# cp ./aws_sdk/install/lib/*.so ./build/lib/
181-
#
182-
# # Build driver
183-
# - name: Build driver
184-
# working-directory: ${{ github.workspace }}/build
185-
# shell: bash
186-
# run: make -j4
187-
#
188-
# # Test driver
189-
# - name: Run failover tests on Linux
190-
# if: success()
191-
# working-directory: ${{ github.workspace }}/build/unit_testing
192-
# shell: bash
193-
# run: ctest --output-on-failure
194-
#
195-
# # Upload artifacts
196-
# - name: Upload build artifacts - Binaries
197-
# if: always()
198-
# uses: actions/upload-artifact@v4
199-
# with:
200-
# name: linux-failover-binaries
201-
# path: ${{ github.workspace }}/build/bin/
202-
# - name: Upload build artifacts - Libraries
203-
# if: always()
204-
# uses: actions/upload-artifact@v2
205-
# with:
206-
# name: linux-failover-libraries
207-
# path: ${{ github.workspace }}/build/lib/
208-
# - name: Upload test artifacts
209-
# if: always()
210-
# uses: actions/upload-artifact@v2
211-
# with:
212-
# name: linux-failover-results
213-
# path: ${{ github.workspace }}/build/unit_testing/Testing/Temporary/LastTest.log
123+
build-linux:
124+
name: Linux
125+
runs-on: ubuntu-latest
126+
env:
127+
CMAKE_GENERATOR: Unix Makefiles
128+
CXX: g++-11
129+
steps:
130+
- name: Checkout source code
131+
uses: actions/checkout@v4
132+
133+
# Configure build environment/dependencies
134+
- name: Install build dependencies
135+
run: sudo apt-get update && sudo apt-get install
136+
g++-11
137+
build-essential
138+
libgtk-3-dev
139+
unixodbc
140+
unixodbc-dev
141+
libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev # AWS SDK dependencies
142+
143+
- name: Install MySQL client libs and include files
144+
run: |
145+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64.tar.xz -o mysql.tar.gz
146+
tar xf mysql.tar.gz
147+
148+
- name: Cache AWS SDK libraries
149+
id: cache-dynamic-aws-sdk
150+
uses: actions/cache@v4
151+
with:
152+
path: |
153+
aws_sdk
154+
key: ${{ runner.os }}-aws-sdk-dynamic-lib
155+
156+
- name: Build and install AWS SDK C++
157+
working-directory: ./scripts
158+
if: steps.cache-dynamic-aws-sdk.outputs.cache-hit != 'true'
159+
run: |
160+
./build_aws_sdk_unix.sh $LINUX_BUILD_TYPE
161+
162+
- name: Create build environment
163+
shell: bash
164+
run: cmake -E make_directory ${{ github.workspace }}/build
165+
166+
- name: Configure CMake
167+
shell: bash
168+
run: cmake -S . -B build
169+
-G "$CMAKE_GENERATOR"
170+
-DCMAKE_BUILD_TYPE=$LINUX_BUILD_TYPE
171+
-DMYSQLCLIENT_STATIC_LINKING=true
172+
-DWITH_UNIXODBC=1
173+
-DCONNECTOR_PLATFORM=linux
174+
-DMYSQL_DIR=./mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64/
175+
-DENABLE_UNIT_TESTS=TRUE
176+
-DENABLE_INTEGRATION_TESTS=FALSE
177+
178+
- name: copy AWS SDK libraries to driver library
179+
run: |
180+
cp ./aws_sdk/install/lib/*.so ./build/lib/
181+
182+
# Build driver
183+
- name: Build driver
184+
working-directory: ${{ github.workspace }}/build
185+
shell: bash
186+
run: make -j4
187+
188+
# Test driver
189+
- name: Run failover tests on Linux
190+
if: success()
191+
working-directory: ${{ github.workspace }}/build/unit_testing
192+
shell: bash
193+
run: ctest --output-on-failure
194+
195+
# Upload artifacts
196+
- name: Upload build artifacts - Binaries
197+
if: always()
198+
uses: actions/upload-artifact@v4
199+
with:
200+
name: linux-failover-binaries
201+
path: ${{ github.workspace }}/build/bin/
202+
- name: Upload build artifacts - Libraries
203+
if: always()
204+
uses: actions/upload-artifact@v2
205+
with:
206+
name: linux-failover-libraries
207+
path: ${{ github.workspace }}/build/lib/
208+
- name: Upload test artifacts
209+
if: always()
210+
uses: actions/upload-artifact@v2
211+
with:
212+
name: linux-failover-results
213+
path: ${{ github.workspace }}/build/unit_testing/Testing/Temporary/LastTest.log
214214

215215
build-mac:
216216
name: MacOS
@@ -250,7 +250,7 @@ jobs:
250250
251251
source /Users/runner/.bash_profile
252252
253-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-macos14-x86_64.tar.gz -o mysql.tar.gz
253+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-macos14-x86_64.tar.gz -o mysql.tar.gz
254254
tar -xzvf mysql.tar.gz
255255
256256
- name: Cache AWS SDK libraries

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# Configure build environment/dependencies
3535
- name: Install MySQL client libs
3636
run: |
37-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
37+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
3838
unzip -d C:/ mysql.zip
3939
4040
- name: Add msbuild to PATH
@@ -162,11 +162,11 @@ jobs:
162162
163163
brew update
164164
brew unlink unixodbc
165-
brew install libiodbc mysql@8.3 mysql-client@8.3
165+
brew install libiodbc mysql@8.4 mysql-client@8.4
166166
brew link --overwrite --force libiodbc
167-
brew link --overwrite --force mysql@8.3
168-
echo 'export PATH="/usr/local/opt/mysql@8.3/bin:$PATH"' >> /Users/runner/.bash_profile
169-
echo 'export PATH="/usr/local/opt/mysql-client@8.3/bin:$PATH"' >> /Users/runner/.bash_profile
167+
brew link --overwrite --force mysql@8.4
168+
echo 'export PATH="/usr/local/opt/mysql@8.4/bin:$PATH"' >> /Users/runner/.bash_profile
169+
echo 'export PATH="/usr/local/opt/mysql-client@8.4/bin:$PATH"' >> /Users/runner/.bash_profile
170170
171171
brew install openssl@3
172172
rm -f /usr/local/lib/libssl.3.dylib
@@ -176,7 +176,7 @@ jobs:
176176
177177
source /Users/runner/.bash_profile
178178
179-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-macos14-x86_64.tar.gz -o mysql.tar.gz
179+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-macos14-x86_64.tar.gz -o mysql.tar.gz
180180
tar -xzvf mysql.tar.gz
181181
182182
- name: Cache AWS SDK libraries

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
ln -s /usr/local/opt/openssl@3/lib/libssl.3.dylib /usr/local/lib/
4646
ln -s /usr/local/opt/openssl@3/lib/libcrypto.3.dylib /usr/local/lib/
4747
48-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-macos13-x86_64.tar.gz -o mysql.tar.gz
48+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-macos13-x86_64.tar.gz -o mysql.tar.gz
4949
tar -xzvf mysql.tar.gz
5050
5151
- name: Build and install AWS SDK C++
@@ -107,7 +107,7 @@ jobs:
107107
#
108108
# - name: Install MySQL client libs and include files
109109
# run: |
110-
# 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
110+
# curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64.tar.xz -o mysql.tar.gz
111111
# tar xf mysql.tar.gz
112112
#
113113
# - name: Build and install AWS SDK C++
@@ -161,7 +161,7 @@ jobs:
161161
# Configure build environment/dependencies
162162
- name: Install MySQL client libs
163163
run: |
164-
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
164+
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
165165
unzip -d C:/ mysql.zip
166166
167167
- name: Add msbuild to PATH

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -539,6 +539,7 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/ssl_setup.cmake)
539539
setup_ssl_libs()
540540

541541
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
542+
INCLUDE_DIRECTORIES(${ctpl_SOURCE_DIR})
542543

543544
add_subdirectory(extra/otel)
544545
ADD_SUBDIRECTORY(util)

‎driver/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ WHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
164164
ADD_LIBRARY(${DRIVER_NAME_STATIC} STATIC ${DRIVER_SRCS} ${AWSSDK_LIB_DIR})
165165
ADD_LIBRARY(${DRIVER_NAME} SHARED ${DRIVER_SRCS} ${AWSSDK_LIB_DIR})
166166

167-
ADD_LIBRARY(${DRIVER_NAME} MODULE ${DRIVER_SRCS})
168-
169167
add_version_info(${DRIVER_NAME}
170168
"AWS ODBC ${DRIVER_TYPE} Driver For MySQL."
171169
"Provides core driver functionality."

‎setupgui/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ add_version_info(awsmysqlodbcS
102102
"Provides driver configuration GUI."
103103
)
104104

105-
target_link_libraries(myodbc8S ${ODBCLIB} ${ODBCINSTLIB} otel_api)
105+
target_link_libraries(awsmysqlodbcS ${ODBCLIB} ${ODBCINSTLIB} otel_api)
106106

107107
# Note: When using GTK+, these libraries will be linked to -gtk modules.
108108

‎testframework/src/test/java/host/IntegrationContainerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@ private void buildDriver(boolean enableIntegrationTests, boolean enablePerforman
181181
"unixodbc", "unixodbc-dev", "curl", "libcurl4-openssl-dev", "libssl-dev", "uuid-dev", "zlib1g-dev", "-y");
182182
System.out.println(result.getStdout());
183183

184-
System.out.println("curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-8.3.0-linux-glibc2.28-x86_64.tar.xz -o mysql.tar.gz");
184+
System.out.println("curl -L https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz -o mysql.tar.gz");
185185
result = testContainer.execInContainer(
186-
"curl", "-L", "https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-8.3.0-linux-glibc2.28-x86_64.tar.xz", "-o", "mysql.tar.gz");
186+
"curl", "-L", "https://dev.mysql.com/get/Downloads/MySQL-8.4/mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz", "-o", "mysql.tar.gz");
187187
System.out.println(result.getStdout());
188188

189189
System.out.println("tar xf mysql.tar.gz");

‎testframework/src/test/java/utility/ContainerHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ protected boolean isRunning(InspectContainerResponse containerInfo) {
202202
}
203203

204204
public static GenericContainer<?> createMysqlContainer(Network network) {
205-
return new GenericContainer<>("mysql:8.3.0")
205+
return new GenericContainer<>("mysql:8.4.0")
206206
.withNetwork(network)
207207
.withNetworkAliases("mysql-instance")
208208
.withEnv("MYSQL_ROOT_PASSWORD", "root")

0 commit comments

Comments
 (0)