Skip to content

Commit 387e741

Browse files
committed
chore: bump version and update changelog
1 parent ab6eb56 commit 387e741

File tree

7 files changed

+37
-16
lines changed

7 files changed

+37
-16
lines changed

.github/workflows/build-installer.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44

55
env:
66
BUILD_TYPE: Release
7+
DRIVER_VERSION: 1.1.0
78

89
jobs:
910
build-windows:
@@ -64,7 +65,7 @@ jobs:
6465
run: |
6566
choco upgrade jq -y
6667
. ".\sign_installer.ps1"
67-
Invoke-SignInstaller ${{ github.workspace }}\wix winx64a ${{github.ref_name}} ${{ secrets.AWS_UNSIGNED_BUCKET }} ${{ secrets.AWS_SIGNED_BUCKET }} ${{ secrets.AWS_S3_KEY }}aws-mysql-odbc-${{github.ref_name}}-winx64a.msi
68+
Invoke-SignInstaller ${{ github.workspace }}\wix winx64a ${{ env.DRIVER_VERSION}} ${{ secrets.AWS_UNSIGNED_BUCKET }} ${{ secrets.AWS_SIGNED_BUCKET }} ${{ secrets.AWS_S3_KEY }}aws-mysql-odbc-${{ env.DRIVER_VERSION}}-winx64a.msi
6869
6970
- name: Upload Windows installer as artifact
7071
if: success()

.github/workflows/integration.yml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ on:
1616
- 'docs/**'
1717
- 'ISSUE_TEMPLATE/**'
1818
- '**/remove-old-artifacts.yml'
19+
- '**/build-installer.yml'
20+
- '**/release.yml'
1921

2022
env:
2123
BUILD_TYPE: Release

.github/workflows/release.yml

+20-9
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ jobs:
7979

8080
- name: Upload macOS installer as artifact
8181
if: success()
82-
uses: actions/upload-artifact@v3
82+
uses: actions/upload-artifact@v4
8383
with:
84-
name: installers
84+
name: installers-mac
8585
path: ${{ github.workspace }}/build/aws-mysql-odbc-*.pkg
8686
if-no-files-found: error
8787

@@ -143,9 +143,9 @@ jobs:
143143

144144
- name: Upload Linux installer as artifact
145145
if: success()
146-
uses: actions/upload-artifact@v3
146+
uses: actions/upload-artifact@v4
147147
with:
148-
name: installers
148+
name: installers-linux
149149
path: ${{ github.workspace }}/build/aws-mysql-odbc-*.tar.gz
150150
if-no-files-found: error
151151

@@ -165,6 +165,13 @@ jobs:
165165
curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
166166
unzip -d C:/ mysql.zip
167167
168+
- name: Install OpenSSL 3
169+
run: |
170+
curl -L https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-3.3.1.zip -o openssl3.zip
171+
unzip -d C:/ openssl3.zip
172+
cp -r C:/openssl-3/x64/bin/libssl-3-x64.dll C:/Windows/System32/
173+
cp -r C:/openssl-3/x64/bin/libcrypto-3-x64.dll C:/Windows/System32/
174+
168175
- name: Add msbuild to PATH
169176
uses: microsoft/setup-msbuild@v2
170177

@@ -178,7 +185,7 @@ jobs:
178185

179186
- name: Run build installer script
180187
run: |
181-
.\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64 "${{env.WIX_DIR}}"
188+
.\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64 "${{env.WIX_DIR}}" C:/openssl-3/x64/include/
182189
183190
- name: Configure AWS credentials
184191
uses: aws-actions/[email protected]
@@ -201,9 +208,9 @@ jobs:
201208
202209
- name: Upload Windows installer as artifact
203210
if: success()
204-
uses: actions/upload-artifact@v3
211+
uses: actions/upload-artifact@v4
205212
with:
206-
name: installers
213+
name: installers-windows
207214
path: ${{ github.workspace }}/wix/*.msi
208215
if-no-files-found: error
209216

@@ -212,10 +219,14 @@ jobs:
212219
runs-on: ubuntu-latest
213220
needs: [build-mac, build-linux, build-windows]
214221
steps:
222+
- name: Checkout source code
223+
uses: actions/checkout@v4
215224
- name: Download all installers
216225
uses: actions/[email protected]
217226
with:
218-
name: installers
227+
path: installers
228+
pattern: installers-*
229+
merge-multiple: true
219230

220231
# Get tag version for release
221232
- name: Set Version Env Variable
@@ -233,5 +244,5 @@ jobs:
233244
draft: true
234245
name: "AWS ODBC Driver for MySQL - v${{ env.RELEASE_VERSION }}"
235246
bodyFile: RELEASE_DETAILS.md
236-
artifacts: "./*.pkg, ./*.tar.gz, ./*.msi"
247+
artifacts: "*/*.pkg, */*.tar.gz, */*.msi"
237248
token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/#semantic-versioning-200).
55

6+
## [1.1.0] - 2024-09-04
7+
### :magic_wand: Added
8+
- [Okta authentication support](./docs/using-the-aws-driver/OktaAuthentication.md).
9+
10+
### :bug: Fixed
11+
- Access violation error when retrieving driver diagnostic data ([Issue 202](https://github.com/aws/aws-mysql-odbc/issues/202)).
12+
613
## [1.0.0] - 2024-07-17
714
The Amazon Web Services (AWS) ODBC Driver for MySQL allows an application to take advantage of the features of clustered MySQL databases. It is based on and can be used as a drop-in compatible for the MySQL Connector/ODBC driver, and is compatible with all MySQL deployments.
815

16+
[1.1.0]: https://github.com/aws/aws-mysql-odbc/compare/1.0.0...1.1.0
917
[1.0.0]: https://github.com/aws/aws-mysql-odbc/releases/tag/1.0.0

build_installer.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ $CONFIGURATION = $args[1]
4848
$GENERATOR = $args[2]
4949
$MYSQL_DIR = $args[3]
5050
$WIX_DIR = $args[4]
51+
$OPENSSL_INCLUDE_DIR = $args[5]
5152

5253
# Set default values
5354
if ($null -eq $CONFIGURATION) {
@@ -58,7 +59,7 @@ if ($null -eq $MYSQL_DIR) {
5859
}
5960

6061
# BUILD DRIVER
61-
cmake -S . -B ./build -G $GENERATOR -DMYSQL_DIR="$MYSQL_DIR" -DMYSQLCLIENT_STATIC_LINKING=TRUE -DCMAKE_BUILD_TYPE="$CONFIGURATION" -DBUNDLE_DEPENDENCIES=TRUE
62+
cmake -S . -B ./build -G $GENERATOR -DMYSQL_DIR="$MYSQL_DIR" -DMYSQLCLIENT_STATIC_LINKING=TRUE -DCMAKE_BUILD_TYPE="$CONFIGURATION" -DBUNDLE_DEPENDENCIES=TRUE -DOPENSSL_INCLUDE_DIR="$OPENSSL_INCLUDE_DIR"
6263
cmake --build ./build --config "$CONFIGURATION"
6364

6465
# CREATE INSTALLER

docs/building-the-aws-driver/BuildingTheAwsDriver.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@
1414
cmake -S . -B build -G "Visual Studio 17 2022" -DMYSQL_DIR="C:\Program Files\MySQL\MySQL Server 8.3" -DMYSQLCLIENT_STATIC_LINKING=TRUE
1515
cmake --build build --config Release
1616
```
17-
4. To build the installer, MySQL 8.0.36 is required. Other MySQL versions may not work. Download the [MySQL 8.0.36](https://downloads.mysql.com/archives/community/) ZIP archive or msi installer. If the zip archive is used, unzip it to a folder before using it.
18-
19-
Run `build_installer.ps1` with specified MySQL 8.0.36 installation or unzipped folder path in a developer powershell. For example
17+
4. To build the installer, run the following command:
2018
```
21-
.\build_installer.ps1 x64 Release "Visual Studio 17 2022" "C:\Users\MyUser\Downloads\mysql-8.0.36-winx64\mysql-8.0.36-winx64"
19+
.\build_installer.ps1 x64 Release "Visual Studio 17 2022"
2220
```
2321
2422
### Troubleshooting:

version.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
3030

3131
SET(CONNECTOR_MAJOR "1")
32-
SET(CONNECTOR_MINOR "0")
32+
SET(CONNECTOR_MINOR "1")
3333
SET(CONNECTOR_PATCH "0")
3434
SET(CONNECTOR_LEVEL "")
3535
SET(CONNECTOR_QUALITY "GA")

0 commit comments

Comments
 (0)