From 992a27d11955a99acce1841956e564e66b28311d Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 19 Oct 2023 09:47:09 +0100 Subject: [PATCH] Adjusted the path to mingw64 in the Windows automated Github build. --- .github/workflows/build-installers.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-installers.yml b/.github/workflows/build-installers.yml index 500cc7d3f..fd8740af4 100644 --- a/.github/workflows/build-installers.yml +++ b/.github/workflows/build-installers.yml @@ -34,7 +34,7 @@ jobs: choco install ant -r --no-progress - name: Check install locations run: | - dir C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64/bin + dir C:/ProgramData/mingw64/mingw64/bin dir 'C:/Program Files/' dir 'C:/Program Files (x86)/' dir 'C:/Program Files (x86)/WiX Toolset v3.11/bin' @@ -45,7 +45,7 @@ jobs: $propfile = 'tools.properties' $java_home_forward = $env:JAVA_HOME -replace '\\', '/' $workspace_forward = $PWD -replace '\\', '/' - (Get-Content $propfile) -replace 'mingw_root=.*', "mingw_root=C:/ProgramData/chocolatey/lib/mingw/tools/install/mingw64" | Set-Content $propfile + (Get-Content $propfile) -replace 'mingw_root=.*', "mingw_root=C:/ProgramData/mingw64/mingw64" | Set-Content $propfile (Get-Content $propfile) -replace 'wix_bin=.*', "wix_bin=C:/Program Files (x86)/WiX Toolset v3.11/bin" | Set-Content $propfile - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@859c33240bd026ce8d5f711f5adcc65c2f8eafc1