Skip to content

Commit

Permalink
chore: bump version and update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
karenc-bq committed Sep 5, 2024
1 parent ab6eb56 commit 387e741
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:

env:
BUILD_TYPE: Release
DRIVER_VERSION: 1.1.0

jobs:
build-windows:
Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
run: |
choco upgrade jq -y
. ".\sign_installer.ps1"
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
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
- name: Upload Windows installer as artifact
if: success()
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ on:
- 'docs/**'
- 'ISSUE_TEMPLATE/**'
- '**/remove-old-artifacts.yml'
- '**/build-installer.yml'
- '**/release.yml'

env:
BUILD_TYPE: Release
Expand Down
29 changes: 20 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ jobs:

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

Expand Down Expand Up @@ -143,9 +143,9 @@ jobs:

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

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

Expand All @@ -178,7 +185,7 @@ jobs:

- name: Run build installer script
run: |
.\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64 "${{env.WIX_DIR}}"
.\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64 "${{env.WIX_DIR}}" C:/openssl-3/x64/include/
- name: Configure AWS credentials
uses: aws-actions/[email protected]
Expand All @@ -201,9 +208,9 @@ jobs:
- name: Upload Windows installer as artifact
if: success()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: installers
name: installers-windows
path: ${{ github.workspace }}/wix/*.msi
if-no-files-found: error

Expand All @@ -212,10 +219,14 @@ jobs:
runs-on: ubuntu-latest
needs: [build-mac, build-linux, build-windows]
steps:
- name: Checkout source code
uses: actions/checkout@v4
- name: Download all installers
uses: actions/[email protected]
with:
name: installers
path: installers
pattern: installers-*
merge-multiple: true

# Get tag version for release
- name: Set Version Env Variable
Expand All @@ -233,5 +244,5 @@ jobs:
draft: true
name: "AWS ODBC Driver for MySQL - v${{ env.RELEASE_VERSION }}"
bodyFile: RELEASE_DETAILS.md
artifacts: "./*.pkg, ./*.tar.gz, ./*.msi"
artifacts: "*/*.pkg, */*.tar.gz, */*.msi"
token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@ All notable changes to this project will be documented in this file.

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).

## [1.1.0] - 2024-09-04
### :magic_wand: Added
- [Okta authentication support](./docs/using-the-aws-driver/OktaAuthentication.md).

### :bug: Fixed
- Access violation error when retrieving driver diagnostic data ([Issue 202](https://github.com/aws/aws-mysql-odbc/issues/202)).

## [1.0.0] - 2024-07-17
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.

[1.1.0]: https://github.com/aws/aws-mysql-odbc/compare/1.0.0...1.1.0
[1.0.0]: https://github.com/aws/aws-mysql-odbc/releases/tag/1.0.0
3 changes: 2 additions & 1 deletion build_installer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ $CONFIGURATION = $args[1]
$GENERATOR = $args[2]
$MYSQL_DIR = $args[3]
$WIX_DIR = $args[4]
$OPENSSL_INCLUDE_DIR = $args[5]

# Set default values
if ($null -eq $CONFIGURATION) {
Expand All @@ -58,7 +59,7 @@ if ($null -eq $MYSQL_DIR) {
}

# BUILD DRIVER
cmake -S . -B ./build -G $GENERATOR -DMYSQL_DIR="$MYSQL_DIR" -DMYSQLCLIENT_STATIC_LINKING=TRUE -DCMAKE_BUILD_TYPE="$CONFIGURATION" -DBUNDLE_DEPENDENCIES=TRUE
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"
cmake --build ./build --config "$CONFIGURATION"

# CREATE INSTALLER
Expand Down
6 changes: 2 additions & 4 deletions docs/building-the-aws-driver/BuildingTheAwsDriver.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@
cmake -S . -B build -G "Visual Studio 17 2022" -DMYSQL_DIR="C:\Program Files\MySQL\MySQL Server 8.3" -DMYSQLCLIENT_STATIC_LINKING=TRUE
cmake --build build --config Release
```
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.

Run `build_installer.ps1` with specified MySQL 8.0.36 installation or unzipped folder path in a developer powershell. For example
4. To build the installer, run the following command:
```
.\build_installer.ps1 x64 Release "Visual Studio 17 2022" "C:\Users\MyUser\Downloads\mysql-8.0.36-winx64\mysql-8.0.36-winx64"
.\build_installer.ps1 x64 Release "Visual Studio 17 2022"
```

### Troubleshooting:
Expand Down
2 changes: 1 addition & 1 deletion version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

SET(CONNECTOR_MAJOR "1")
SET(CONNECTOR_MINOR "0")
SET(CONNECTOR_MINOR "1")
SET(CONNECTOR_PATCH "0")
SET(CONNECTOR_LEVEL "")
SET(CONNECTOR_QUALITY "GA")
Expand Down

0 comments on commit 387e741

Please sign in to comment.