diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 1ebf3227f..103f5f1e4 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -18,6 +18,8 @@ env: JAVA_VERSION: 20 OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.2/openjfx-20.0.2_windows-x64_bin-jmods.zip' OPENJFX_JMODS_AMD64_HASH: '18625bbc13c57dbf802486564247a8d8cab72ec558c240a401bf6440384ebd77' + WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi' + WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta9/winfsp-uninstaller.exe' defaults: run: @@ -292,13 +294,11 @@ jobs: shell: pwsh - name: Download WinFsp run: | - $winfspUrl = (Select-String -Path ".\dist\win\bundle\resources\winfsp.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value - curl --output dist/win/bundle/resources/winfsp.msi -L $winfspUrl + curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }} shell: pwsh - name: Download Legacy-WinFsp uninstaller run: | - $winfspUninstallerUrl = (Select-String -Path ".\dist\win\bundle\resources\winfsp-uninstaller.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value - curl --output dist/win/bundle/resources/winfsp-uninstaller.exe -L $winfspUninstallerUrl + curl --output dist/win/bundle/resources/winfsp-uninstaller.exe -L ${{ env.WINFSP_UNINSTALLER }} shell: pwsh - name: Compile to wixObj file run: > diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 7a11f0136..2606a3778 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -176,12 +176,12 @@ $Env:JP_WIXHELPER_DIR = "." "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges" # download Winfsp -$winfspMsiUrl= (Select-String -Path ".\bundle\resources\winfsp.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value +$winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi' Write-Output "Downloading ${winfspMsiUrl}..." Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default # download legacy-winfsp uninstaller -$winfspUninstaller= (Select-String -Path ".\bundle\resources\winfsp-uninstaller.url" -Pattern 'URL=(https://.+)$').Matches.Groups[1].Value +$winfspUninstaller= 'https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta9/winfsp-uninstaller.exe' Write-Output "Downloading ${winfspUninstaller}..." Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninstaller.exe" # redirects are followed by default diff --git a/dist/win/bundle/resources/winfsp-uninstaller.url b/dist/win/bundle/resources/winfsp-uninstaller.url deleted file mode 100644 index 96c678d6e..000000000 --- a/dist/win/bundle/resources/winfsp-uninstaller.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://github.com/cryptomator/winfsp-uninstaller/releases/download/1.0.0-beta9/winfsp-uninstaller.exe \ No newline at end of file diff --git a/dist/win/bundle/resources/winfsp.url b/dist/win/bundle/resources/winfsp.url deleted file mode 100644 index 99b3e93b6..000000000 --- a/dist/win/bundle/resources/winfsp.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi \ No newline at end of file