fix workflow

openvpi · Oct 3, 2024 · e9c94bc · e9c94bc
1 parent 6b5d5f4
commit e9c94bc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/actions/init-build/action.yml b/.github/actions/init-build/action.yml
@@ -77,7 +77,8 @@ runs:
           cd vcpkg
           git pull origin master
         }
-        $env:QT_DIR=$env:Qt5_DIR
+        $env:QT_DIR="$env:Qt5_DIR/lib/cmake/Qt5"
+        $env:Qt5_DIR=$env:QT_DIR
         $env:VCPKG_KEEP_ENV_VARS="QT_DIR;Qt5_DIR"
         ./vcpkg install `
           --x-manifest-root=${{ github.workspace }}/scripts/vcpkg-manifest `
@@ -119,7 +120,7 @@ runs:
       if: inputs.os == 'windows-latest' && steps.cache_asiosdk.outputs.cache-hit != 'true'
       shell: pwsh
       run: |
-        Invoke-WebRequest -Uri https://download.steinberg.net/sdk_downloads/asiosdk_2.3.3_2019-06-14.zip -OutFile $env:RUNNER_TEMP/asiosdk.zip
+        Invoke-WebRequest -Uri "https://raw.githubusercontent.com/CrSjimo/diffscope-ci-tools-mirror/refs/heads/main/asiosdk_2.3.3_2019-06-14.zip" -OutFile $env:RUNNER_TEMP/asiosdk.zip
         Expand-Archive -Path $env:RUNNER_TEMP/asiosdk.zip -DestinationPath $env:GITHUB_WORKSPACE
         Rename-Item -Path asiosdk_2.3.3_2019-06-14 -NewName asiosdk
 

diff --git a/.github/workflows/generate-bundles-and-release.yml b/.github/workflows/generate-bundles-and-release.yml
@@ -108,7 +108,7 @@ jobs:
         run: |
           Invoke-WebRequest -Uri 'https://raw.githubusercontent.com/jrsoftware/issrc/f59a90485af28067626e60ef7e42336e00ae7472/Files/Languages/Unofficial/ChineseSimplified.isl' -OutFile ChineseSimplified.isl
           Invoke-WebRequest -Uri 'https://raw.githubusercontent.com/jrsoftware/issrc/e5e138e67bacd650650eac489fa861274a4b81ce/Files/Languages/Unofficial/ChineseTraditional.isl' -OutFile ChineseTraditional.isl
-          Invoke-WebRequest -Uri "https://www.gnu.org/licenses/gpl-3.0.rtf" -OutFile gpl-3.0.rtf
+          Invoke-WebRequest -Uri "https://raw.githubusercontent.com/CrSjimo/diffscope-ci-tools-mirror/refs/heads/main/gpl-3.0.rtf" -OutFile gpl-3.0.rtf
           
           $content = Get-Content build/CMakeCache.txt
           $variableValues = @{}
@@ -138,11 +138,11 @@ jobs:
         shell: pwsh
         run: |
           cd scripts/setup/macos
-          Invoke-WebRequest -Uri "http://s.sudre.free.fr/Software/files/Packages.dmg" -OutFile Packages.dmg
+          Invoke-WebRequest -Uri "https://raw.githubusercontent.com/CrSjimo/diffscope-ci-tools-mirror/refs/heads/main/Packages.dmg" -OutFile Packages.dmg
           mkdir Packages
           hdiutil attach -mountpoint Packages Packages.dmg
           sudo installer -pkg 'Packages/Install Packages.pkg' -target /
-          Invoke-WebRequest -Uri "https://www.gnu.org/licenses/gpl-3.0.rtf" -OutFile gpl-3.0.rtf
+          Invoke-WebRequest -Uri "https://raw.githubusercontent.com/CrSjimo/diffscope-ci-tools-mirror/refs/heads/main/gpl-3.0.rtf" -OutFile gpl-3.0.rtf
           ln -s $env:DIFFSCOPE_BRIDGE_ARTEFACTS_DIR diffscope-bridge-artefacts
           packagesbuild diffscope-bridge-dist.pkgproj
           npm install
@@ -155,7 +155,7 @@ jobs:
         run: |
           mv $env:DIFFSCOPE_INSTALLED_DIR DiffScope
           mkdir "DiffScope Bridge"
-          Invoke-WebRequest -Uri "https://www.gnu.org/licenses/gpl-3.0.rtf" -OutFile "DiffScope Bridge/gpl-3.0.rtf"
+          Invoke-WebRequest -Uri "https://raw.githubusercontent.com/CrSjimo/diffscope-ci-tools-mirror/refs/heads/main/gpl-3.0.rtf" -OutFile "DiffScope Bridge/gpl-3.0.rtf"
           mv $env:DIFFSCOPE_BRIDGE_ARTEFACTS_DIR/VST3/*.vst3 "DiffScope Bridge"
           mv $env:DIFFSCOPE_BRIDGE_ARTEFACTS_DIR/LV2/*.lv2 "DiffScope Bridge"
           tar --bzip2 -cf "$env:BINARY_NAME.tar.bz2" DiffScope "DiffScope Bridge"

diff --git a/scripts/vcpkg b/scripts/vcpkg
+7 −2		ports/qastool/portfile.cmake
+1 −1		ports/qastool/vcpkg.json
+2 −1		triplets/arm64-osx.cmake
+2 −1		triplets/x64-osx.cmake