From a8c27027b472201fa31543baa93106665bf1d73e Mon Sep 17 00:00:00 2001 From: JieXu Date: Thu, 18 Jun 2026 17:55:45 +0800 Subject: [PATCH] bump dependencies && Purge SDKs before build (#9576) * Update package-rhel-loong.sh * Update package-debian-loong.sh * Update build.yml * Update build-windows-x86.yml * Enhance SDK purge step with echo statements Added echo statements to display SDKs before and after purging. * Update build-windows-x86.yml * Update build.yml * Update build-windows-x86.yml * Update build.yml * Update build-windows-x86.yml --- .github/workflows/build-windows-x86.yml | 16 ++++++++++++++++ .github/workflows/build.yml | 18 +++++++++++++++++- package-debian-loong.sh | 4 ++-- package-rhel-loong.sh | 4 ++-- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-windows-x86.yml b/.github/workflows/build-windows-x86.yml index 0b6af4c7..34a5dd40 100644 --- a/.github/workflows/build-windows-x86.yml +++ b/.github/workflows/build-windows-x86.yml @@ -34,6 +34,22 @@ jobs: submodules: recursive fetch-depth: 0 + - name: Purge SDKs + shell: pwsh + run: | + echo "Before:" + dotnet --list-sdks + + dotnet --list-sdks | % { + $_ -match '^\S+\s+\[(.+)\]$' > $null + $d = Join-Path $Matches[1] $_.Split()[0] + Write-Host "Removing $d" + if ($IsWindows) { rm $d -r -fo } else { sudo rm -rf "$d" } + } + + echo "After:" + dotnet --list-sdks 2>$null; $LASTEXITCODE=0 + - name: Setup .NET 10.0.1xx uses: actions/setup-dotnet@v5.3.0 with: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8c73a6c0..e46de2e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,22 @@ jobs: submodules: 'recursive' fetch-depth: '0' + - name: Purge SDKs + shell: pwsh + run: | + echo "Before:" + dotnet --list-sdks + + dotnet --list-sdks | % { + $_ -match '^\S+\s+\[(.+)\]$' > $null + $d = Join-Path $Matches[1] $_.Split()[0] + Write-Host "Removing $d" + if ($IsWindows) { rm $d -r -fo } else { sudo rm -rf "$d" } + } + + echo "After:" + dotnet --list-sdks 2>$null; $LASTEXITCODE=0 + - name: Setup .NET uses: actions/setup-dotnet@v5.3.0 with: @@ -68,4 +84,4 @@ jobs: uses: actions/upload-artifact@v7.0.1 with: name: ${{ matrix.arch }} - path: ${{ matrix.arch }} \ No newline at end of file + path: ${{ matrix.arch }} diff --git a/package-debian-loong.sh b/package-debian-loong.sh index e00b0cbf..c665ad24 100644 --- a/package-debian-loong.sh +++ b/package-debian-loong.sh @@ -13,8 +13,8 @@ PKGROOT="v2rayN-publish" PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj" OUTPUT_DIR="${HOME}/debbuild" DOTNET_TFM="net10.0" -DOTNET_LOONGARCH_VERSION="10.0.108" -DOTNET_LOONGARCH_TAG="v10.0.108-loongarch64" +DOTNET_LOONGARCH_VERSION="10.0.109" +DOTNET_LOONGARCH_TAG="v10.0.109-loongarch64" DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download" DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz" DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}" diff --git a/package-rhel-loong.sh b/package-rhel-loong.sh index 258d5ce8..864072e8 100644 --- a/package-rhel-loong.sh +++ b/package-rhel-loong.sh @@ -12,8 +12,8 @@ MIN_KERNEL="5.10" PKGROOT="v2rayN-publish" PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj" RPM_TOPDIR="${HOME}/rpmbuild" -DOTNET_LOONGARCH_VERSION="10.0.108" -DOTNET_LOONGARCH_TAG="v10.0.108-loongarch64" +DOTNET_LOONGARCH_VERSION="10.0.109" +DOTNET_LOONGARCH_TAG="v10.0.109-loongarch64" DOTNET_LOONGARCH_BASE="https://github.com/loongson/dotnet/releases/download" DOTNET_LOONGARCH_FILE="dotnet-sdk-${DOTNET_LOONGARCH_VERSION}-linux-loongarch64.tar.gz" DOTNET_SDK_URL="${DOTNET_LOONGARCH_BASE}/${DOTNET_LOONGARCH_TAG}/${DOTNET_LOONGARCH_FILE}"