diff --git a/.github/workflows/build-installer.yml b/.github/workflows/build-installer.yml index 3b2fd0db7..004d0a6da 100644 --- a/.github/workflows/build-installer.yml +++ b/.github/workflows/build-installer.yml @@ -14,7 +14,7 @@ jobs: runs-on: windows-latest env: CMAKE_GENERATOR: Visual Studio 17 2022 - WIX_DIR: "C:\Program Files (x86)\WiX Toolset v3.14\bin" + WIX_DIR: "C:/Program Files (x86)/WiX Toolset v3.14/bin" steps: - name: Checkout source code uses: actions/checkout@v4 @@ -52,7 +52,7 @@ jobs: - 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}} + .\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/configure-aws-credentials@v4.0.2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 699ed013a..002c0b63d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -154,7 +154,7 @@ jobs: runs-on: windows-latest env: CMAKE_GENERATOR: Visual Studio 17 2022 - WIX_DIR: "C:\Program Files (x86)\WiX Toolset v3.14\bin" + WIX_DIR: "C:/Program Files (x86)/WiX Toolset v3.14/bin" steps: - name: Checkout source code uses: actions/checkout@v4 @@ -178,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 ${{env.WIX_DIR}} + .\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/configure-aws-credentials@v4.0.2 diff --git a/build_installer.ps1 b/build_installer.ps1 index e7bfe0376..e46043521 100644 --- a/build_installer.ps1 +++ b/build_installer.ps1 @@ -54,7 +54,7 @@ if ($null -eq $CONFIGURATION) { $CONFIGURATION = "Release" } if ($null -eq $MYSQL_DIR) { - $MYSQL_DIR = "C:\Program Files\MySQL\MySQL Server 8.0" + $MYSQL_DIR = "C:\Program Files\MySQL\MySQL Server 8.3" } # BUILD DRIVER @@ -85,12 +85,12 @@ if ($ARCHITECTURE -eq "x64") { if ($null -eq $WIX_DIR) { cmake -DMSI_64=1 -G "NMake Makefiles" } else { - cmake -DMSI_64=1 -G "NMake Makefiles" -DWIX_DIR=$WIX_DIR + 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 + cmake -DMSI_64=0 -G "NMake Makefiles" -DWIX_DIR="$WIX_DIR" } nmake