chore: build installer on visual studio 2022

.github/workflows/build-installer.yml

@@ -0,0 +1,82 @@
+name: Build installer
+# This workflow is triggered on creating tags
+on:
+  push:
+    branches:
+      - windows-installer
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build-windows:
+    name: Windows
+    runs-on: windows-latest
+    env:
+      CMAKE_GENERATOR: Visual Studio 17 2022
+      WIX_DIR: "C:\Program Files (x86)\WiX Toolset v3.14\bin"
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      # Configure build environment/dependencies
+      - name: Install MySQL client libs
+        run: |
+          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: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Cache AWS SDK libraries
+        id: cache-dynamic-aws-sdk
+        uses: actions/cache@v4
+        with:
+          path: |
+            aws_sdk
+          key: ${{ runner.os }}-aws-sdk-dynamic-lib
+
+      - name: Build and install AWS SDK C++
+        working-directory: ./scripts
+        if: steps.cache-dynamic-aws-sdk.outputs.cache-hit != 'true'
+        run: |
+          .\build_aws_sdk_win.ps1 x64 ${{ env.BUILD_TYPE}} ON "${{env.CMAKE_GENERATOR}}"
+
+      - name: Setup nmake
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Copy Wix files
+        run: |
+          cp -r "C:\Program Files (x86)\WiX Toolset v3.14\bin" C:\Users\runneradmin\.dotnet\tools
+
+      - name: Run build installer script
+        shell: pwsh
+        run: |
+          .\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64 ${{env.WIX_DIR}}
+
+      - name: Configure AWS credentials
+        uses: aws-actions/[email protected]
+        with:
+          role-skip-session-tagging: true
+          aws-access-key-id: ${{ secrets.AWS_BUILD_KEY }}
+          aws-secret-access-key: ${{ secrets.AWS_BUILD_SECRET_KEY }}
+          aws-region: us-west-2
+          role-to-assume: ${{ secrets.AWS_ROLE_TO_ASSUME }}
+          role-external-id: ${{ secrets.AWS_ROLE_EXTERNAL_ID }}
+          role-duration-seconds: 3600
+
+      - name: Run signer script
+        shell: pwsh
+        working-directory: ./scripts
+        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
+      
+      - name: Upload Windows installer as artifact
+        if: success()
+        uses: actions/upload-artifact@v3
+        with:
+          name: installers
+          path: ${{ github.workspace }}/wix/*.msi
+          if-no-files-found: error

.github/workflows/main.yml

@@ -40,11 +40,6 @@ jobs:
       - name: Add msbuild to PATH
         uses: microsoft/setup-msbuild@v2
 
-      - name: Update CMAKE Version
-        shell: pwsh
-        run: |
-          choco upgrade cmake --pre
-
       - name: Cache AWS SDK libraries
         id: cache-dynamic-aws-sdk
         uses: actions/cache@v4

.github/workflows/release.yml

@@ -151,9 +151,10 @@ jobs:
 
   build-windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-latest
     env:
-      CMAKE_GENERATOR: Visual Studio 16 2019
+      CMAKE_GENERATOR: Visual Studio 17 2022
+      WIX_DIR: "C:\Program Files (x86)\WiX Toolset v3.14\bin"
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
@@ -177,7 +178,7 @@ jobs:
 
       - name: Run build installer script
         run: |
-          .\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64
+          .\build_installer.ps1 x64 ${{ env.BUILD_TYPE}} "${{env.CMAKE_GENERATOR}}" C:/mysql-${{ vars.MYSQL_VERSION }}-winx64 ${{env.WIX_DIR}}
 
       - name: Configure AWS credentials
         uses: aws-actions/[email protected]

build_installer.ps1

@@ -47,6 +47,7 @@ $ARCHITECTURE = $args[0]
 $CONFIGURATION = $args[1]
 $GENERATOR = $args[2]
 $MYSQL_DIR = $args[3]
+$WIX_DIR = $args[4]
 
 # Set default values
 if ($null -eq $CONFIGURATION) {
@@ -81,10 +82,15 @@ Copy-Item .\LICENSE.txt .\Wix\doc
 
 Set-Location .\Wix
 if ($ARCHITECTURE -eq "x64") {
-    cmake -DMSI_64=1 -G "NMake Makefiles"
-}
-else {
+    if ($null -eq $WIX_DIR) {
+        cmake -DMSI_64=1 -G "NMake Makefiles"
+    } else {
+        cmake -DMSI_64=1 -G "NMake Makefiles" -DWIX_DIR=$WIX_DIR
+    }
+} elseif ($null -eq $WIX_DIR) {
     cmake -DMSI_64=0 -G "NMake Makefiles"
+} else {
+    cmake -DMSI_64=0 -G "NMake Makefiles" -DWIX_DIR=$WIX_DIR
 }
 nmake