From e9c94bc4b5939d7a07dcba7d2b6dd579e8221fd9 Mon Sep 17 00:00:00 2001 From: CrSjimo Date: Thu, 3 Oct 2024 17:37:56 +0800 Subject: [PATCH] fix workflow --- .github/actions/init-build/action.yml | 5 +++-- .github/workflows/generate-bundles-and-release.yml | 8 ++++---- scripts/vcpkg | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/actions/init-build/action.yml b/.github/actions/init-build/action.yml index dc31822..4d16d88 100644 --- 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 index 93c80be..bb0e49b 100644 --- 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 index 40d04bf..8f6c3af 160000 --- a/scripts/vcpkg +++ b/scripts/vcpkg @@ -1 +1 @@ -Subproject commit 40d04bf044ba689674e6ecaf7ed5aaeeb696391d +Subproject commit 8f6c3af835528ae5f40dc09c44d40dd80f68fa10