From 52766d66bf77b59138ef31b863ec16c1ec52e287 Mon Sep 17 00:00:00 2001 From: JieXu Date: Mon, 6 Jul 2026 13:48:05 +0800 Subject: [PATCH] Update build-linux.yml (#9684) * Update build-linux.yml * Update package-debian-loong.sh * Update package-rhel-loong.sh * Update package-rhel-loong.sh * Update package-debian-loong.sh --- .github/workflows/build-linux.yml | 4 ++-- package-debian-loong.sh | 17 ++--------------- package-rhel-loong.sh | 17 ++--------------- 3 files changed, 6 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 7bc13ee2..db34928f 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -258,7 +258,7 @@ jobs: export VIRTIOFSD_SOCKET="$RUNNER_TEMP/virtiofs-deb-loong64.sock" rm -f "$VIRTIOFSD_SOCKET" - sudo virtiofsd --socket-path="$VIRTIOFSD_SOCKET" -o source="$GITHUB_WORKSPACE" -o cache=auto & + sudo virtiofsd --socket-path="$VIRTIOFSD_SOCKET" --shared-dir="$GITHUB_WORKSPACE" --cache=auto & VIRTIOFSD_PID=$! trap 'sudo kill "$VIRTIOFSD_PID" 2>/dev/null || true; rm -f "$VIRTIOFSD_SOCKET"' EXIT @@ -408,7 +408,7 @@ jobs: export VIRTIOFSD_SOCKET="$RUNNER_TEMP/virtiofs-rpm-loong64.sock" rm -f "$VIRTIOFSD_SOCKET" - sudo virtiofsd --socket-path="$VIRTIOFSD_SOCKET" -o source="$GITHUB_WORKSPACE" -o cache=auto & + sudo virtiofsd --socket-path="$VIRTIOFSD_SOCKET" --shared-dir="$GITHUB_WORKSPACE" --cache=auto & VIRTIOFSD_PID=$! trap 'sudo kill "$VIRTIOFSD_PID" 2>/dev/null || true; rm -f "$VIRTIOFSD_SOCKET"' EXIT diff --git a/package-debian-loong.sh b/package-debian-loong.sh index c665ad24..76bb0082 100644 --- a/package-debian-loong.sh +++ b/package-debian-loong.sh @@ -8,7 +8,7 @@ BUILD_FROM="" XRAY_VER="${XRAY_VER:-}" SING_VER="${SING_VER:-}" -MIN_KERNEL="5.10" +MIN_KERNEL="6.12" PKGROOT="v2rayN-publish" PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj" OUTPUT_DIR="${HOME}/debbuild" @@ -116,20 +116,7 @@ install_dependencies() { export PATH="$HOME/.dotnet:$PATH" export DOTNET_ROOT="$HOME/.dotnet" - - mkdir -p "$HOME/.nuget/NuGet" - - cat > "$HOME/.nuget/NuGet/NuGet.Config" < - - - - - - - -EOF - + dotnet --info >/dev/null 2>&1 && install_ok=1 fi diff --git a/package-rhel-loong.sh b/package-rhel-loong.sh index 864072e8..9f191b36 100644 --- a/package-rhel-loong.sh +++ b/package-rhel-loong.sh @@ -8,7 +8,7 @@ BUILD_FROM="" XRAY_VER="${XRAY_VER:-}" SING_VER="${SING_VER:-}" -MIN_KERNEL="5.10" +MIN_KERNEL="6.12" PKGROOT="v2rayN-publish" PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj" RPM_TOPDIR="${HOME}/rpmbuild" @@ -112,20 +112,7 @@ install_dependencies() { export PATH="$HOME/.dotnet:$PATH" export DOTNET_ROOT="$HOME/.dotnet" - - mkdir -p "$HOME/.nuget/NuGet" - - cat > "$HOME/.nuget/NuGet/NuGet.Config" < - - - - - - - -EOF - + dotnet --info >/dev/null 2>&1 || install_ok=0 fi