diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index c7d486bf..3c310244 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -70,3 +70,17 @@ jobs: \"release_tag\": \"${{ inputs.release_tag }}\" } }" + + - name: Trigger build windows x86 + if: inputs.release_tag != '' + run: | + curl -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \ + https://api.github.com/repos/${{ github.repository }}/actions/workflows/build-windows-x86.yml/dispatches \ + -d "{ + \"ref\": \"master\", + \"inputs\": { + \"release_tag\": \"${{ inputs.release_tag }}\" + } + }" diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index baeae29a..603dea7e 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -29,14 +29,10 @@ jobs: deb: name: build and release deb x64 & arm64 - if: | - (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) - runs-on: ubuntu-24.04 + if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) + runs-on: ubuntu-26.04 container: debian:13 - env: - RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} - + env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" } steps: - name: Prepare tools (Debian) shell: bash @@ -44,124 +40,73 @@ jobs: set -euo pipefail export DEBIAN_FRONTEND=noninteractive apt-get update - apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \ - ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \ - libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev - + apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev libc6 libgcc-s1 libstdc++6 zlib1g libicu-dev libssl-dev - name: Checkout repo (for scripts) uses: actions/checkout@v6 - with: - submodules: 'recursive' - fetch-depth: '0' - + with: { submodules: 'recursive', fetch-depth: '0' } - name: Ensure script permissions run: chmod 755 package-debian.sh - - name: Package DEB (Debian-family) run: ./package-debian.sh "${RELEASE_TAG}" --arch all - - name: Collect DEBs into workspace run: | mkdir -p "$GITHUB_WORKSPACE/dist/deb" rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb/" || true - find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_amd64.deb" \ - -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-64.deb" \; || true - find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_arm64.deb" \ - -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-arm64.deb" \; || true + find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_amd64.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-64.deb" \; || true + find "$GITHUB_WORKSPACE/dist/deb" -name "v2rayn_*_arm64.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb/v2rayN-linux-arm64.deb" \; || true echo "==== Dist tree ====" ls -R "$GITHUB_WORKSPACE/dist/deb" || true - - name: Upload DEBs to release uses: svenstaro/upload-release-action@v2 - with: - file: dist/deb/**/*.deb - tag: ${{ env.RELEASE_TAG }} - file_glob: true - prerelease: true + with: { file: "dist/deb/**/*.deb", tag: "${{ env.RELEASE_TAG }}", file_glob: true, prerelease: true } rpm: name: build and release rpm x64 & arm64 - if: | - (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) - runs-on: ubuntu-24.04 + if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) + runs-on: ubuntu-26.04 container: registry.access.redhat.com/ubi10/ubi - env: - RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} - + env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" } steps: - name: Prepare tools (Red Hat) shell: bash run: | set -euo pipefail - . /etc/os-release EL_MAJOR="${VERSION_ID%%.*}" echo "EL_MAJOR=${EL_MAJOR}" - dnf -y makecache || true command -v curl >/dev/null || dnf -y install curl ca-certificates - ARCH="$(uname -m)" case "$ARCH" in x86_64|aarch64) ;; *) echo "Unsupported arch: $ARCH"; exit 1 ;; esac install_epel_from_dir() { local base="$1" rpm echo "Try: $base" - - rpm="$( - { - curl -fsSL "$base/Packages/" 2>/dev/null - curl -fsSL "$base/Packages/e/" 2>/dev/null | sed 's|href="|href="e/|' - } | - sed -n 's/.*href="\([^"]*epel-release-[^"]*\.noarch\.rpm\)".*/\1/p' | - sort -V | tail -n1 - )" || true - - if [[ -n "$rpm" ]]; then - dnf -y install "$base/Packages/$rpm" - return 0 - fi - return 1 + rpm="$({ curl -fsSL "$base/Packages/" 2>/dev/null; curl -fsSL "$base/Packages/e/" 2>/dev/null | sed 's|href="|href="e/|'; } | + sed -n 's/.*href="\([^"]*epel-release-[^"]*\.noarch\.rpm\)".*/\1/p' | sort -V | tail -n1)" || true + [[ -n "$rpm" ]] || return 1 + dnf -y install "$base/Packages/$rpm" } FEDORA="https://dl.fedoraproject.org/pub/epel/epel-release-latest-${EL_MAJOR}.noarch.rpm" + ROCKY="https://dl.rockylinux.org/pub/rocky/${EL_MAJOR}/extras/${ARCH}/os" + ALMA="https://repo.almalinux.org/almalinux/${EL_MAJOR}/extras/${ARCH}/os" + echo "Try Fedora: $FEDORA" + curl -fsSLI "$FEDORA" >/dev/null && dnf -y install "$FEDORA" || + install_epel_from_dir "$ROCKY" || + install_epel_from_dir "$ALMA" || + { echo "EPEL bootstrap failed (Fedora/Rocky/Alma)"; exit 1; } - if curl -fsSLI "$FEDORA" >/dev/null; then - dnf -y install "$FEDORA" - else - ROCKY="https://dl.rockylinux.org/pub/rocky/${EL_MAJOR}/extras/${ARCH}/os" - if install_epel_from_dir "$ROCKY"; then - : - else - ALMA="https://repo.almalinux.org/almalinux/${EL_MAJOR}/extras/${ARCH}/os" - if install_epel_from_dir "$ALMA"; then - : - else - echo "EPEL bootstrap failed (Fedora/Rocky/Alma)" - exit 1 - fi - fi - fi - - dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core \ - rsync findutils tar gzip unzip which - + dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which dnf repolist | grep -i epel || true - - name: Checkout repo (for scripts) uses: actions/checkout@v6 - with: - submodules: 'recursive' - fetch-depth: '0' - + with: { submodules: 'recursive', fetch-depth: '0' } - name: Ensure script permissions run: chmod 755 package-rhel.sh - - name: Package RPM (RHEL-family) run: ./package-rhel.sh "${RELEASE_TAG}" --arch all - - name: Collect RPMs into workspace run: | mkdir -p "$GITHUB_WORKSPACE/dist/rpm" @@ -170,39 +115,26 @@ jobs: find "$GITHUB_WORKSPACE/dist/rpm" -name "v2rayN-*-1*.aarch64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm/v2rayN-linux-rhel-arm64.rpm" \; || true echo "==== Dist tree ====" ls -R "$GITHUB_WORKSPACE/dist/rpm" || true - - name: Upload RPMs to release uses: svenstaro/upload-release-action@v2 - with: - file: dist/rpm/**/*.rpm - tag: ${{ env.RELEASE_TAG }} - file_glob: true - prerelease: true + with: { file: "dist/rpm/**/*.rpm", tag: "${{ env.RELEASE_TAG }}", file_glob: true, prerelease: true } rpm-riscv64: name: build and release rpm riscv64 - if: | - (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) + if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) runs-on: ubuntu-24.04-riscv container: rockylinux/rockylinux:10 - env: - RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} - + env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" } steps: - name: Prepare tools (Red Hat) shell: bash run: | set -euo pipefail dnf -y makecache - dnf -y install \ - sudo git rpm-build rpmdevtools dnf-plugins-core \ - rsync findutils tar gzip unzip which jq - + dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which jq - name: Checkout repo (for scripts) shell: bash - env: - GITHUB_TOKEN: ${{ github.token }} + env: { GITHUB_TOKEN: "${{ github.token }}" } run: | set -euo pipefail rm -rf ./* @@ -212,37 +144,28 @@ jobs: git fetch --depth=1 origin "${GITHUB_SHA}" git checkout FETCH_HEAD git submodule update --init --recursive - - name: Ensure script permissions run: chmod 755 package-rhel-riscv.sh - - name: Package RPM (RHEL-family) run: ./package-rhel-riscv.sh "${RELEASE_TAG}" - - name: Collect RPMs into workspace run: | mkdir -p "$GITHUB_WORKSPACE/dist/rpm-riscv64" rsync -av "$HOME/rpmbuild/RPMS/" "$GITHUB_WORKSPACE/dist/rpm-riscv64/" || true - find "$GITHUB_WORKSPACE/dist/rpm-riscv64" -name "*.riscv64.rpm" \ - -exec mv {} "$GITHUB_WORKSPACE/dist/rpm-riscv64/v2rayN-linux-rhel-riscv64.rpm" \; || true + find "$GITHUB_WORKSPACE/dist/rpm-riscv64" -name "*.riscv64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm-riscv64/v2rayN-linux-rhel-riscv64.rpm" \; || true echo "==== Dist tree ====" ls -R "$GITHUB_WORKSPACE/dist/rpm-riscv64" || true - - name: Upload RPMs to release shell: bash - env: - GITHUB_TOKEN: ${{ github.token }} + env: { GITHUB_TOKEN: "${{ github.token }}" } run: | set -euo pipefail shopt -s globstar nullglob - files=(dist/rpm-riscv64/**/*.rpm) (( ${#files[@]} )) || { echo "No RPMs found."; exit 1; } - api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}" upload_url="$(curl -fsSL -H "Authorization: Bearer ${GITHUB_TOKEN}" "$api" | jq -r '.upload_url // empty' | sed 's/{?name,label}//')" [[ "$upload_url" ]] || { echo "Release upload URL not found: ${RELEASE_TAG}"; exit 1; } - for f in "${files[@]}"; do echo "Uploading ${f##*/}" curl -fsSL -X POST \ @@ -254,14 +177,10 @@ jobs: deb-riscv64: name: build and release deb riscv64 - if: | - (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) + if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) runs-on: ubuntu-24.04-riscv container: debian:13 - env: - RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} - + env: { RELEASE_TAG: "${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}" } steps: - name: Prepare tools (Debian) shell: bash @@ -269,14 +188,10 @@ jobs: set -euo pipefail export DEBIAN_FRONTEND=noninteractive apt-get update - apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file \ - ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev \ - gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1 - + apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1 - name: Checkout repo (for scripts) shell: bash - env: - GITHUB_TOKEN: ${{ github.token }} + env: { GITHUB_TOKEN: "${{ github.token }}" } run: | set -euo pipefail rm -rf ./* @@ -286,37 +201,28 @@ jobs: git fetch --depth=1 origin "${GITHUB_SHA}" git checkout FETCH_HEAD git submodule update --init --recursive - - name: Ensure script permissions run: chmod 755 package-debian-riscv.sh - - name: Package DEB (Debian-family) run: ./package-debian-riscv.sh "${RELEASE_TAG}" - - name: Collect DEBs into workspace run: | mkdir -p "$GITHUB_WORKSPACE/dist/deb-riscv64" rsync -av "$HOME/debbuild/" "$GITHUB_WORKSPACE/dist/deb-riscv64/" || true - find "$GITHUB_WORKSPACE/dist/deb-riscv64" -name "*.deb" \ - -exec mv {} "$GITHUB_WORKSPACE/dist/deb-riscv64/v2rayN-linux-riscv64.deb" \; || true + find "$GITHUB_WORKSPACE/dist/deb-riscv64" -name "*.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb-riscv64/v2rayN-linux-riscv64.deb" \; || true echo "==== Dist tree ====" ls -R "$GITHUB_WORKSPACE/dist/deb-riscv64" || true - - name: Upload DEBs to release shell: bash - env: - GITHUB_TOKEN: ${{ github.token }} + env: { GITHUB_TOKEN: "${{ github.token }}" } run: | set -euo pipefail shopt -s globstar nullglob - files=(dist/deb-riscv64/**/*.deb) (( ${#files[@]} )) || { echo "No DEBs found."; exit 1; } - api="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/tags/${RELEASE_TAG}" upload_url="$(curl -fsSL -H "Authorization: Bearer ${GITHUB_TOKEN}" "$api" | jq -r '.upload_url // empty' | sed 's/{?name,label}//')" [[ "$upload_url" ]] || { echo "Release upload URL not found: ${RELEASE_TAG}"; exit 1; } - for f in "${files[@]}"; do echo "Uploading ${f##*/}" curl -fsSL -X POST \ @@ -328,11 +234,8 @@ jobs: deb-loong64: name: build and release deb loong64 - if: | - (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || - (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) - runs-on: ubuntu-24.04 - + if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) + runs-on: ubuntu-26.04 env: RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} QCOW2_URL: https://github.com/xujiegb/debian-loong64-qcow2/releases/download/13.5/debian13-loong64.qcow2 @@ -342,74 +245,72 @@ jobs: EFI_CODE: edk2-loongarch64-code.fd EFI_VARS: edk2-loongarch64-vars.fd QEMU_VERSION: 10.2.3 - steps: - name: Prepare host tools shell: bash run: | set -euo pipefail - sudo apt-get update - sudo apt-get install -y rsync qemu-utils expect wget curl ca-certificates libfdt1 libglib2.0-0 libpixman-1-0 libslirp0 - - - name: Checkout repo - uses: actions/checkout@v6 - with: - submodules: recursive - fetch-depth: 0 - + sudo apt-get install -y git rsync qemu-utils qemu-system-common expect wget curl ca-certificates libfdt1 libglib2.0-0 libpixman-1-0 libslirp0 virtiofsd + sudo ln -sf /usr/libexec/virtiofsd /usr/local/bin/virtiofsd + virtiofsd --version || virtiofsd --help | head + - name: Host clone repo + shell: bash + env: { GITHUB_TOKEN: "${{ github.token }}" } + run: | + set -euo pipefail + rm -rf repo + git clone --no-single-branch --tags "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" repo - name: Download QEMU prebuild run: | set -euo pipefail - - wget -O qemu-linux-x64.tar.gz \ - "https://github.com/xujiegb/qemu-linux-prebuild/releases/download/${QEMU_VERSION}/qemu-linux-x64.tar.gz" - - tar -xzf qemu-linux-x64.tar.gz - + wget -O qemu-linux-x64-v3.tar.gz "https://github.com/xujiegb/qemu-linux-prebuild/releases/download/${QEMU_VERSION}/qemu-linux-x64-v3.tar.gz" + tar -xzf qemu-linux-x64-v3.tar.gz mkdir -p "$HOME/qemu-install" - - rsync -a qemu-linux-x64/ "$HOME/qemu-install/" - + rsync -a qemu-linux-x64-v3/ "$HOME/qemu-install/" "$HOME/qemu-install/bin/qemu-system-loongarch64" --version - - name: Download loong64 qcow2 and EFI firmware shell: bash run: | set -euo pipefail - wget -O "$QCOW2_IMAGE" "$QCOW2_URL" wget -O "$EFI_CODE" "$EFI_CODE_URL" wget -O "$EFI_VARS" "$EFI_VARS_URL" - qemu-img info "$QCOW2_IMAGE" - - name: Build loong64 DEB in VM through serial console shell: bash timeout-minutes: 180 - env: - RELEASE_TAG: ${{ env.RELEASE_TAG }} + env: { RELEASE_TAG: "${{ env.RELEASE_TAG }}" } run: | set -euo pipefail - mkdir -p "$GITHUB_WORKSPACE/dist/deb-loong64" + 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 & + + VIRTIOFSD_PID=$! + trap 'sudo kill "$VIRTIOFSD_PID" 2>/dev/null || true; rm -f "$VIRTIOFSD_SOCKET"' EXIT + + for i in {1..100}; do + [[ -S "$VIRTIOFSD_SOCKET" ]] && break + sleep 0.1 + done + + [[ -S "$VIRTIOFSD_SOCKET" ]] || { echo "virtiofsd socket not created"; exit 1; } + sudo chown "$USER:$(id -gn)" "$VIRTIOFSD_SOCKET" || true + sudo chmod 660 "$VIRTIOFSD_SOCKET" || true expect <<'EOF' log_user 1 set timeout -1 - set release_tag $env(RELEASE_TAG) set qemu_bin "$env(HOME)/qemu-install/bin/qemu-system-loongarch64" set qemu_rom_dir "$env(HOME)/qemu-install/share/qemu" - - set workspace $env(GITHUB_WORKSPACE) - set repo $env(GITHUB_REPOSITORY) - set sha $env(GITHUB_SHA) - + set virtiofs_socket $env(VIRTIOFSD_SOCKET) set qcow2 $env(QCOW2_IMAGE) set efi_code $env(EFI_CODE) set efi_vars $env(EFI_VARS) - proc wait_prompt {} { expect { -re "__CI_PROMPT__# " {} @@ -417,86 +318,216 @@ jobs: eof { exit 1 } } } - proc run_cmd {cmd} { send -- "$cmd\r" wait_prompt } - spawn $qemu_bin \ -L $qemu_rom_dir \ -machine virt \ -accel tcg,thread=multi,tb-size=2048 \ -cpu la464 \ -m 9216 \ + -object memory-backend-memfd,id=mem0,size=9216M,share=on \ + -numa node,memdev=mem0 \ -smp 4 \ -drive if=pflash,format=raw,unit=0,file=$efi_code,readonly=on \ -drive if=pflash,format=raw,unit=1,file=$efi_vars \ -device virtio-blk-pci,drive=hd0,bootindex=1 \ -drive if=none,media=disk,id=hd0,file=$qcow2,format=qcow2 \ -netdev user,id=net0 \ - -device virtio-net-pci,netdev=net0 \ - -virtfs local,path=$workspace,mount_tag=workspace,security_model=none,id=workspace \ + -device virtio-net-pci-non-transitional,netdev=net0 \ + -chardev socket,id=charfs0,path=$virtiofs_socket \ + -device vhost-user-fs-pci,chardev=charfs0,tag=workspace \ -display none \ -serial stdio \ -monitor none - expect -re "login:|debian login:" send -- "root\r" - expect -re "Password:|密码:|密码:" send -- "password\r" - expect { -re "# " {} timeout { exit 1 } eof { exit 1 } } - send -- "export TERM=dumb; export PS1='__CI_PROMPT__# '\r" wait_prompt - run_cmd "mkdir -p /workspace" - run_cmd "mount -t 9p -o trans=virtio,version=9p2000.L workspace /workspace || mount -t 9p -o trans=virtio workspace /workspace" + run_cmd "mount -t virtiofs workspace /workspace" run_cmd "IFACE=\$(ip -o link show | awk -F': ' '\$2 != \"lo\" {print \$2; exit}') ; ip link set \$IFACE up || true" run_cmd "dhclient \$IFACE || true" run_cmd "printf 'nameserver 10.0.2.3\nnameserver 1.1.1.1\n' >/etc/resolv.conf" run_cmd "apt-get update || apt-get update || apt-get update" - run_cmd "DEBIAN_FRONTEND=noninteractive apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1" + run_cmd "DEBIAN_FRONTEND=noninteractive apt-get install -y sudo git rsync findutils tar gzip unzip which curl jq wget file ca-certificates desktop-file-utils xdg-utils fakeroot dpkg-dev gcc make libc6-dev libgcc-s1 libstdc++6 zlib1g libatomic1 fuse3" run_cmd "rm -rf /root/v2rayN-src" - run_cmd "git clone --recursive https://github.com/$repo.git /root/v2rayN-src" - run_cmd "cd /root/v2rayN-src && git fetch --depth=1 origin $sha && git checkout FETCH_HEAD && git submodule update --init --recursive" + run_cmd "rsync -a --info=progress2 /workspace/repo/ /root/v2rayN-src/" + run_cmd "cd /root/v2rayN-src && git config --global --add safe.directory /root/v2rayN-src" run_cmd "cd /root/v2rayN-src && chmod 755 package-debian-loong.sh" - send -- "cd /root/v2rayN-src; cat >/tmp/run-loong-build.sh <<'SCRIPT'\nset +e\nset -o pipefail\nbash -x ./package-debian-loong.sh \"\$RELEASE_TAG\" 2>&1 | tee /tmp/build.log\nrc=\$?\nmkdir -p /workspace/dist/deb-loong64\ncp -av /root/debbuild/*.deb /workspace/dist/deb-loong64/ 2>/dev/null || true\necho __BUILD_DONE__\$rc\nSCRIPT\nRELEASE_TAG=\"$release_tag\" bash /tmp/run-loong-build.sh\r" - expect { - -re "__BUILD_DONE__0" { - send -- "poweroff\r" - } - default { - exit 1 - } + -re "__BUILD_DONE__0" { send -- "poweroff\r" } + default { exit 1 } } EOF - - name: Collect DEBs shell: bash run: | set -euo pipefail - mkdir -p "$GITHUB_WORKSPACE/dist/deb-loong64" - - find "$GITHUB_WORKSPACE/dist/deb-loong64" -name "*.deb" \ - -exec mv {} "$GITHUB_WORKSPACE/dist/deb-loong64/v2rayN-linux-loong64.deb" \; || true - + find "$GITHUB_WORKSPACE/dist/deb-loong64" -name "*.deb" -exec mv {} "$GITHUB_WORKSPACE/dist/deb-loong64/v2rayN-linux-loong64.deb" \; || true echo "==== Dist tree ====" ls -R "$GITHUB_WORKSPACE/dist/deb-loong64" - - name: Upload DEBs to release uses: svenstaro/upload-release-action@v2 - with: - file: dist/deb-loong64/**/*.deb - tag: ${{ env.RELEASE_TAG }} - file_glob: true - prerelease: true + with: { file: "dist/deb-loong64/**/*.deb", tag: "${{ env.RELEASE_TAG }}", file_glob: true, prerelease: true } + + rpm-loong64: + name: build and release rpm loong64 + if: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) + runs-on: ubuntu-26.04 + env: + RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} + QCOW2_URL: https://github.com/xujiegb/fedora-loong64-qcow2/releases/download/43/fedora43-loong64.qcow2 + EFI_CODE_URL: https://github.com/xujiegb/fedora-loong64-qcow2/releases/download/43/edk2-loongarch64-code.fd + EFI_VARS_URL: https://github.com/xujiegb/fedora-loong64-qcow2/releases/download/43/edk2-loongarch64-vars.fd + QCOW2_IMAGE: fedora43-loong64.qcow2 + EFI_CODE: edk2-loongarch64-code.fd + EFI_VARS: edk2-loongarch64-vars.fd + QEMU_VERSION: 10.2.3 + steps: + - name: Prepare host tools + shell: bash + run: | + set -euo pipefail + sudo apt-get update + sudo apt-get install -y git rsync qemu-utils qemu-system-common expect wget curl ca-certificates libfdt1 libglib2.0-0 libpixman-1-0 libslirp0 virtiofsd + sudo ln -sf /usr/libexec/virtiofsd /usr/local/bin/virtiofsd + virtiofsd --version || virtiofsd --help | head + - name: Host clone repo + shell: bash + env: { GITHUB_TOKEN: "${{ github.token }}" } + run: | + set -euo pipefail + rm -rf repo + git clone --no-single-branch --tags "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git" repo + - name: Download QEMU prebuild + run: | + set -euo pipefail + wget -O qemu-linux-x64-v3.tar.gz "https://github.com/xujiegb/qemu-linux-prebuild/releases/download/${QEMU_VERSION}/qemu-linux-x64-v3.tar.gz" + tar -xzf qemu-linux-x64-v3.tar.gz + mkdir -p "$HOME/qemu-install" + rsync -a qemu-linux-x64-v3/ "$HOME/qemu-install/" + "$HOME/qemu-install/bin/qemu-system-loongarch64" --version + - name: Download loong64 qcow2 and EFI firmware + shell: bash + run: | + set -euo pipefail + wget -O "$QCOW2_IMAGE" "$QCOW2_URL" + wget -O "$EFI_CODE" "$EFI_CODE_URL" + wget -O "$EFI_VARS" "$EFI_VARS_URL" + qemu-img info "$QCOW2_IMAGE" + - name: Build loong64 RPM in VM through serial console + shell: bash + timeout-minutes: 180 + env: { RELEASE_TAG: "${{ env.RELEASE_TAG }}" } + run: | + set -euo pipefail + mkdir -p "$GITHUB_WORKSPACE/dist/rpm-loong64" + + 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 & + + VIRTIOFSD_PID=$! + trap 'sudo kill "$VIRTIOFSD_PID" 2>/dev/null || true; rm -f "$VIRTIOFSD_SOCKET"' EXIT + + for i in {1..100}; do + [[ -S "$VIRTIOFSD_SOCKET" ]] && break + sleep 0.1 + done + + [[ -S "$VIRTIOFSD_SOCKET" ]] || { echo "virtiofsd socket not created"; exit 1; } + sudo chown "$USER:$(id -gn)" "$VIRTIOFSD_SOCKET" || true + sudo chmod 660 "$VIRTIOFSD_SOCKET" || true + expect <<'EOF' + log_user 1 + set timeout -1 + set release_tag $env(RELEASE_TAG) + set qemu_bin "$env(HOME)/qemu-install/bin/qemu-system-loongarch64" + set qemu_rom_dir "$env(HOME)/qemu-install/share/qemu" + set virtiofs_socket $env(VIRTIOFSD_SOCKET) + set qcow2 $env(QCOW2_IMAGE) + set efi_code $env(EFI_CODE) + set efi_vars $env(EFI_VARS) + proc wait_prompt {} { + expect { + -re "__CI_PROMPT__# " {} + timeout { exit 1 } + eof { exit 1 } + } + } + proc run_cmd {cmd} { + send -- "$cmd\r" + wait_prompt + } + spawn $qemu_bin \ + -L $qemu_rom_dir \ + -machine virt \ + -accel tcg,thread=multi,tb-size=2048 \ + -cpu la464 \ + -m 9216 \ + -object memory-backend-memfd,id=mem0,size=9216M,share=on \ + -numa node,memdev=mem0 \ + -smp 4 \ + -drive if=pflash,format=raw,unit=0,file=$efi_code,readonly=on \ + -drive if=pflash,format=raw,unit=1,file=$efi_vars \ + -device virtio-blk-pci,drive=hd0,bootindex=1 \ + -drive if=none,media=disk,id=hd0,file=$qcow2,format=qcow2 \ + -netdev user,id=net0 \ + -device virtio-net-pci-non-transitional,netdev=net0 \ + -chardev socket,id=charfs0,path=$virtiofs_socket \ + -device vhost-user-fs-pci,chardev=charfs0,tag=workspace \ + -display none \ + -serial stdio \ + -monitor none + expect -re "login:|fedora login:" + send -- "root\r" + expect -re "Password:|密码:|密码:" + send -- "password\r" + expect { + -re "# " {} + timeout { exit 1 } + eof { exit 1 } + } + send -- "export TERM=dumb; export PS1='__CI_PROMPT__# '\r" + wait_prompt + run_cmd "mkdir -p /workspace" + run_cmd "mount -t virtiofs workspace /workspace" + run_cmd "IFACE=\$(ip -o link show | awk -F': ' '\$2 != \"lo\" {print \$2; exit}') ; ip link set \$IFACE up || true" + run_cmd "dhclient \$IFACE || true" + run_cmd "printf 'nameserver 10.0.2.3\nnameserver 1.1.1.1\n' >/etc/resolv.conf" + run_cmd "dnf -y makecache || dnf -y makecache || dnf -y makecache" + run_cmd "dnf -y install sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which curl jq file ca-certificates fuse3 --nogpgcheck" + run_cmd "rm -rf /root/v2rayN-src" + run_cmd "rsync -a --info=progress2 /workspace/repo/ /root/v2rayN-src/" + run_cmd "cd /root/v2rayN-src && git config --global --add safe.directory /root/v2rayN-src" + run_cmd "cd /root/v2rayN-src && chmod 755 package-rhel-loong.sh" + send -- "cd /root/v2rayN-src; cat >/tmp/run-loong-rpm-build.sh <<'SCRIPT'\nset +e\nset -o pipefail\nbash -x ./package-rhel-loong.sh \"\$RELEASE_TAG\" 2>&1 | tee /tmp/build.log\nrc=\$?\nmkdir -p /workspace/dist/rpm-loong64\nfind /root/rpmbuild/RPMS -name '*.rpm' -exec cp -av {} /workspace/dist/rpm-loong64/ \\; 2>/dev/null || true\necho __BUILD_DONE__\$rc\nSCRIPT\nRELEASE_TAG=\"$release_tag\" bash /tmp/run-loong-rpm-build.sh\r" + expect { + -re "__BUILD_DONE__0" { send -- "poweroff\r" } + default { exit 1 } + } + EOF + - name: Collect RPMs + shell: bash + run: | + set -euo pipefail + mkdir -p "$GITHUB_WORKSPACE/dist/rpm-loong64" + find "$GITHUB_WORKSPACE/dist/rpm-loong64" -name "*.loongarch64.rpm" -exec mv {} "$GITHUB_WORKSPACE/dist/rpm-loong64/v2rayN-linux-rhel-loong64.rpm" \; || true + echo "==== Dist tree ====" + ls -R "$GITHUB_WORKSPACE/dist/rpm-loong64" + - name: Upload RPMs to release + uses: svenstaro/upload-release-action@v2 + with: { file: "dist/rpm-loong64/**/*.rpm", tag: "${{ env.RELEASE_TAG }}", file_glob: true, prerelease: true } diff --git a/.github/workflows/build-windows-x86.yml b/.github/workflows/build-windows-x86.yml new file mode 100644 index 00000000..f3209e0e --- /dev/null +++ b/.github/workflows/build-windows-x86.yml @@ -0,0 +1,215 @@ +name: release Windows x86 + +on: + workflow_dispatch: + inputs: + release_tag: + required: false + type: string + +permissions: + contents: write + +jobs: + package-x86: + name: build and release windows x86 WPF & Avalonia + if: inputs.release_tag != '' + runs-on: windows-latest + + strategy: + fail-fast: false + matrix: + include: + - flavor: wpf + project: ./v2rayN/v2rayN/v2rayN.csproj + zip_name: v2rayN-windows-86.zip + - flavor: desktop + project: ./v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj + zip_name: v2rayN-windows-86-desktop.zip + + steps: + - name: Checkout + uses: actions/checkout@v6.0.2 + with: + submodules: recursive + fetch-depth: 0 + + - name: Setup .NET 10.0.1xx + uses: actions/setup-dotnet@v5.2.0 + with: + dotnet-version: 10.0.1xx + + - name: Publish ${{ matrix.flavor }} win-x86 + shell: pwsh + run: | + $ErrorActionPreference = "Stop" + + dotnet restore "${{ matrix.project }}" -r win-x86 + + dotnet publish "${{ matrix.project }}" ` + -c Release ` + -r win-x86 ` + -p:SelfContained=true ` + -p:EnableWindowsTargeting=true ` + -o "publish/${{ matrix.flavor }}" + + - name: Publish AmazTool win-x86 + shell: pwsh + run: | + $ErrorActionPreference = "Stop" + + dotnet publish "./v2rayN/AmazTool/AmazTool.csproj" ` + -c Release ` + -r win-x86 ` + -p:SelfContained=true ` + -p:PublishTrimmed=true ` + -p:EnableWindowsTargeting=true ` + -o "publish/${{ matrix.flavor }}" + + - name: Detect bundled core versions + id: detect-core + shell: pwsh + run: | + $ErrorActionPreference = "Stop" + + New-Item -ItemType Directory -Force -Path "tmp/probe" | Out-Null + + Invoke-WebRequest -Uri "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/v2rayN-windows-64/bin/xray/xray.exe" -OutFile "tmp/probe/xray.exe" + $xrayOutput = (& "tmp/probe/xray.exe" version) -join "`n" + Write-Host $xrayOutput + + $xrayMatch = [regex]::Match($xrayOutput, 'Xray\s+([0-9.]+)') + if ($xrayMatch.Success) { + $xrayVer = $xrayMatch.Groups[1].Value + } else { + throw "Failed to detect Xray version" + } + + Invoke-WebRequest -Uri "https://github.com/2dust/v2rayN-core-bin/raw/refs/heads/master/v2rayN-windows-64/bin/sing_box/sing-box.exe" -OutFile "tmp/probe/sing-box.exe" + $singOutput = (& "tmp/probe/sing-box.exe" version) -join "`n" + Write-Host $singOutput + + $singMatch = [regex]::Match($singOutput, 'sing-box version\s+([0-9.]+)') + if ($singMatch.Success) { + $singVer = $singMatch.Groups[1].Value + } else { + throw "Failed to detect sing-box version" + } + + Write-Host "Bundled Xray version: $xrayVer" + Write-Host "Bundled sing-box version: $singVer" + + "xray_version=$xrayVer" >> $env:GITHUB_OUTPUT + "sing_version=$singVer" >> $env:GITHUB_OUTPUT + + - name: Download x86 cores and rule assets + shell: pwsh + env: + GH_TOKEN: ${{ github.token }} + run: | + $ErrorActionPreference = "Stop" + + $headers = @{ + Authorization = "Bearer $env:GH_TOKEN" + Accept = "application/vnd.github+json" + "X-GitHub-Api-Version" = "2022-11-28" + } + + $root = "publish/${{ matrix.flavor }}" + $bin = Join-Path $root "bin" + $xrayDir = Join-Path $bin "xray" + $singDir = Join-Path $bin "sing_box" + $srssDir = Join-Path $bin "srss" + + New-Item -ItemType Directory -Force -Path $xrayDir, $singDir, $srssDir | Out-Null + + $xrayVer = "${{ steps.detect-core.outputs.xray_version }}" + $singVer = "${{ steps.detect-core.outputs.sing_version }}" + + $xrayTag = "v$xrayVer" + $singTag = "v$singVer" + + $xrayUrl = "https://github.com/autorepobot/Xray-core/releases/download/$xrayTag/Xray-windows-32.zip" + $singUrl = "https://github.com/SagerNet/sing-box/releases/download/$singTag/sing-box-$singVer-windows-386.zip" + + Write-Host "Bundled Xray version: $xrayVer" + Write-Host "Bundled sing-box version: $singVer" + Write-Host "Xray: $xrayUrl" + Write-Host "sing-box: $singUrl" + + New-Item -ItemType Directory -Force -Path "tmp" | Out-Null + + Invoke-WebRequest -Uri $xrayUrl -OutFile "tmp/xray.zip" + Expand-Archive -Force "tmp/xray.zip" "tmp/xray" + + Get-ChildItem "tmp/xray" -Recurse -Include "*.exe","*.dll" | ForEach-Object { + Copy-Item $_.FullName (Join-Path $xrayDir $_.Name) -Force + } + + Invoke-WebRequest -Uri $singUrl -OutFile "tmp/sing-box.zip" + Expand-Archive -Force "tmp/sing-box.zip" "tmp/sing-box" + + $singExe = Get-ChildItem "tmp/sing-box" -Recurse -Filter "sing-box.exe" | Select-Object -First 1 + if (-not $singExe) { + throw "sing-box.exe not found" + } + + Copy-Item $singExe.FullName "$singDir/sing-box.exe" -Force + + $cronet = Get-ChildItem "tmp/sing-box" -Recurse -Filter "libcronet*.dll" | Select-Object -First 1 + if ($cronet) { + Copy-Item $cronet.FullName "$singDir/libcronet.dll" -Force + } + + Invoke-WebRequest -Uri "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat" -OutFile "$bin/geosite.dat" + Invoke-WebRequest -Uri "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat" -OutFile "$bin/geoip.dat" + Invoke-WebRequest -Uri "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat" -OutFile "$bin/geoip-only-cn-private.dat" + Invoke-WebRequest -Uri "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb" -OutFile "$bin/Country.mmdb" + Invoke-WebRequest -Uri "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" -OutFile "$bin/geoip.metadb" + + $geoipRules = @( + "geoip-private.srs", + "geoip-cn.srs", + "geoip-facebook.srs", + "geoip-fastly.srs", + "geoip-google.srs", + "geoip-netflix.srs", + "geoip-telegram.srs", + "geoip-twitter.srs" + ) + + foreach ($f in $geoipRules) { + Invoke-WebRequest -Uri "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f" -OutFile "$srssDir/$f" + } + + $geositeRules = @( + "geosite-cn.srs", + "geosite-gfw.srs", + "geosite-google.srs", + "geosite-greatfire.srs", + "geosite-geolocation-cn.srs", + "geosite-category-ads-all.srs", + "geosite-private.srs" + ) + + foreach ($f in $geositeRules) { + Invoke-WebRequest -Uri "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f" -OutFile "$srssDir/$f" + } + + - name: Package zip + shell: pwsh + run: | + $ErrorActionPreference = "Stop" + + Compress-Archive ` + -Path "publish/${{ matrix.flavor }}/*" ` + -DestinationPath "${{ matrix.zip_name }}" ` + -Force + + - name: Upload zip archive to release + uses: svenstaro/upload-release-action@v2 + with: + file: ${{ matrix.zip_name }} + tag: ${{ inputs.release_tag }} + prerelease: true + overwrite: true diff --git a/package-debian-riscv.sh b/package-debian-riscv.sh index e9fcb628..2890f48f 100644 --- a/package-debian-riscv.sh +++ b/package-debian-riscv.sh @@ -12,7 +12,7 @@ MIN_KERNEL="5.10" PKGROOT="v2rayN-publish" PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj" OUTPUT_DIR="${HOME}/debbuild" -DOTNET_RISCV_VERSION="10.0.108" +DOTNET_RISCV_VERSION="10.0.109" DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download" DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz" DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}" diff --git a/package-rhel-loong.sh b/package-rhel-loong.sh new file mode 100644 index 00000000..258d5ce8 --- /dev/null +++ b/package-rhel-loong.sh @@ -0,0 +1,709 @@ +#!/usr/bin/env bash +set -euo pipefail + +VERSION_ARG="" +WITH_CORE="both" +FORCE_NETCORE=0 +BUILD_FROM="" +XRAY_VER="${XRAY_VER:-}" +SING_VER="${SING_VER:-}" + +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_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}" + +OS_ID="" +OS_NAME="" +OS_VERSION_ID="" +HOST_ARCH="" +SCRIPT_DIR="" +PROJECT="" +VERSION="" + +declare -a BUILT_RPMS=() + +die() { + echo "$*" >&2 + exit 1 +} + +parse_args() { + local first_arg="${1:-}" + + if [[ -n "$first_arg" && "$first_arg" != --* ]]; then + VERSION_ARG="$first_arg" + shift || true + fi + + while [[ $# -gt 0 ]]; do + case "$1" in + --with-core) WITH_CORE="${2:-both}"; shift 2 ;; + --xray-ver) XRAY_VER="${2:-}"; shift 2 ;; + --singbox-ver) SING_VER="${2:-}"; shift 2 ;; + --netcore) FORCE_NETCORE=1; shift ;; + --buildfrom) BUILD_FROM="${2:-}"; shift 2 ;; + *) + [[ -n "${VERSION_ARG:-}" ]] || VERSION_ARG="$1" + shift + ;; + esac + done + + if [[ -n "${VERSION_ARG:-}" && -n "${BUILD_FROM:-}" ]]; then + die "You cannot specify both an explicit version and --buildfrom at the same time. + Provide either a version (e.g. 7.14.0) OR --buildfrom 1|2|3." + fi +} + +detect_environment() { + local current_kernel="" + local lowest="" + + . /etc/os-release + + OS_ID="${ID:-}" + OS_NAME="${NAME:-$OS_ID}" + OS_VERSION_ID="${VERSION_ID:-}" + HOST_ARCH="$(uname -m)" + + case "$OS_ID" in + rhel|rocky|almalinux|fedora|centos) + echo "Detected supported system: ${OS_NAME:-$OS_ID} ${OS_VERSION_ID:-}" + ;; + *) + die "Unsupported system: ${OS_NAME:-unknown} (${OS_ID:-unknown}). +This script only supports: RHEL / Rocky / AlmaLinux / Fedora / CentOS." + ;; + esac + + case "$HOST_ARCH" in + loongarch64) ;; + *) die "Only supports loongarch64" ;; + esac + + current_kernel="$(uname -r)" + lowest="$(printf '%s\n%s\n' "$MIN_KERNEL" "$current_kernel" | sort -V | head -n1)" + + [[ "$lowest" == "$MIN_KERNEL" ]] || die "Kernel $current_kernel is below $MIN_KERNEL" + echo "[OK] Kernel $current_kernel verified." +} + +install_dependencies() { + local install_ok=0 + local tmp_dotnet="" + + if command -v dnf >/dev/null 2>&1; then + sudo dnf -y --nogpgcheck install \ + rpm-build rpmdevtools curl unzip tar jq rsync git python3 \ + glibc-devel kernel-headers libatomic file ca-certificates libicu \ + && install_ok=1 + + mkdir -p "$HOME/.dotnet" + tmp_dotnet="$(mktemp -d)" + curl -fL "$DOTNET_SDK_URL" -o "$tmp_dotnet/$DOTNET_LOONGARCH_FILE" + tar -C "$HOME/.dotnet" -xzf "$tmp_dotnet/$DOTNET_LOONGARCH_FILE" + rm -rf "$tmp_dotnet" + + 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 + + if [[ "$install_ok" -ne 1 ]]; then + echo "Could not auto-install dependencies for '$OS_ID'. Make sure these are available:" + echo "dotnet-loongarch SDK, curl, unzip, tar, rsync, git, python3, rpm, rpmdevtools, rpm-build (on Red Hat branch)" + exit 1 + fi +} + +prepare_workspace() { + SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" + cd "$SCRIPT_DIR" + + if [[ -f .gitmodules ]]; then + git submodule sync --recursive || true + git submodule update --init --recursive || true + fi + + PROJECT="$PROJECT_HINT" + [[ -f "$PROJECT" ]] || PROJECT="$(find . -maxdepth 3 -name 'v2rayN.Desktop.csproj' | head -n1 || true)" + [[ -f "$PROJECT" ]] || die "v2rayN.Desktop.csproj not found" +} + +choose_channel() { + local ch="latest" + local sel="" + + if [[ -n "${BUILD_FROM:-}" ]]; then + case "$BUILD_FROM" in + 1) echo "latest"; return 0 ;; + 2) echo "prerelease"; return 0 ;; + 3) echo "keep"; return 0 ;; + *) die "[ERROR] Invalid --buildfrom value: ${BUILD_FROM}. Use 1|2|3." ;; + esac + fi + + if [[ -t 0 ]]; then + echo "[?] Choose v2rayN release channel:" >&2 + echo " 1) Latest (stable) [default]" >&2 + echo " 2) Pre-release (preview)" >&2 + echo " 3) Keep current (do nothing)" >&2 + printf "Enter 1, 2 or 3 [default 1]: " >&2 + + if read -r sel /dev/null 2>&1; then + git fetch --tags --force --prune --depth=1 || true + git rev-parse "refs/tags/${want}" >/dev/null 2>&1 && ref="$want" + + if [[ -n "$ref" ]]; then + echo "[OK] Found ref '${ref}', checking out..." + git checkout -f "$ref" + sync_submodules + return 0 + fi + fi + + return 1 +} + +apply_channel_or_keep() { + local ch="$1" + local tag="" + + if [[ "$ch" == "keep" ]]; then + echo "[*] Keep current repository state (no checkout)." + VERSION="$(git describe --tags --abbrev=0 2>/dev/null || echo '0.0.0+git')" + VERSION="${VERSION#v}" + return 0 + fi + + echo "[*] Resolving ${ch} tag from GitHub releases..." + + case "$ch" in + latest) tag="$(get_latest_tag_latest || true)" ;; + prerelease) tag="$(get_latest_tag_prerelease || true)" ;; + *) die "Failed to resolve latest tag for channel '${ch}'." ;; + esac + + [[ -n "$tag" ]] || die "Failed to resolve latest tag for channel '${ch}'." + + echo "[*] Latest tag for '${ch}': ${tag}" + git_try_checkout "$tag" || die "Failed to checkout '${tag}'." + VERSION="${tag#v}" +} + +resolve_version() { + if git rev-parse --git-dir >/dev/null 2>&1; then + if [[ -n "${VERSION_ARG:-}" ]]; then + local clean_ver="${VERSION_ARG#v}" + + if git_try_checkout "$clean_ver"; then + VERSION="$clean_ver" + else + echo "[WARN] Tag '${VERSION_ARG}' not found." + apply_channel_or_keep "$(choose_channel)" + fi + else + apply_channel_or_keep "$(choose_channel)" + fi + else + echo "Current directory is not a git repo; proceeding on current tree." + VERSION="${VERSION_ARG:-0.0.0}" + fi + + VERSION="${VERSION#v}" + echo "[*] GUI version resolved as: ${VERSION}" +} + +xray_url_for_rid() { + local rid="$1" + local ver="$2" + + case "$rid" in + linux-loongarch64) echo "https://github.com/XTLS/Xray-core/releases/download/v${ver}/Xray-linux-loong64.zip" ;; + *) return 1 ;; + esac +} + +singbox_url_for_rid() { + local rid="$1" + local ver="$2" + + case "$rid" in + linux-loongarch64) echo "https://github.com/SagerNet/sing-box/releases/download/v${ver}/sing-box-${ver}-linux-loong64.tar.gz" ;; + *) return 1 ;; + esac +} + +bundle_url_for_rid() { + local rid="$1" + + case "$rid" in + linux-loongarch64) echo "https://raw.githubusercontent.com/2dust/v2rayN-core-bin/refs/heads/master/v2rayN-linux-loong64.zip" ;; + *) return 1 ;; + esac +} + +download_xray() { + local outdir="$1" + local rid="$2" + local ver="${XRAY_VER:-}" + local url="" + local tmp="" + + mkdir -p "$outdir" + + if [[ -z "$ver" ]]; then + ver="$(curl -fsSL https://api.github.com/repos/XTLS/Xray-core/releases/latest \ + | grep -Eo '"tag_name":\s*"v[^"]+"' \ + | sed -E 's/.*"v([^"]+)".*/\1/' \ + | head -n1)" || true + fi + + [[ -n "$ver" ]] || { echo "[xray] Failed to get version"; return 1; } + url="$(xray_url_for_rid "$rid" "$ver")" || { echo "[xray] Unsupported RID: $rid"; return 1; } + + echo "[+] Download xray: $url" + + tmp="$(mktemp -d)" + curl -fL "$url" -o "$tmp/xray.zip" || { rm -rf "$tmp"; return 1; } + unzip -q "$tmp/xray.zip" -d "$tmp" || { rm -rf "$tmp"; return 1; } + install -m 755 "$tmp/xray" "$outdir/xray" || { rm -rf "$tmp"; return 1; } + rm -rf "$tmp" +} + +download_singbox() { + local outdir="$1" + local rid="$2" + local ver="${SING_VER:-}" + local url="" + local tmp="" + local bin="" + local cronet="" + + mkdir -p "$outdir" + + if [[ -z "$ver" ]]; then + ver="$(curl -fsSL https://api.github.com/repos/SagerNet/sing-box/releases/latest \ + | grep -Eo '"tag_name":\s*"v[^"]+"' \ + | sed -E 's/.*"v([^"]+)".*/\1/' \ + | head -n1)" || true + fi + + [[ -n "$ver" ]] || { echo "[sing-box] Failed to get version"; return 1; } + url="$(singbox_url_for_rid "$rid" "$ver")" || { echo "[sing-box] Unsupported RID: $rid"; return 1; } + + echo "[+] Download sing-box: $url" + + tmp="$(mktemp -d)" + curl -fL "$url" -o "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; } + tar -C "$tmp" -xzf "$tmp/singbox.tar.gz" || { rm -rf "$tmp"; return 1; } + + bin="$(find "$tmp" -type f -name 'sing-box' | head -n1 || true)" + [[ -n "$bin" ]] || { echo "[!] sing-box unpack failed"; rm -rf "$tmp"; return 1; } + + install -m 755 "$bin" "$outdir/sing-box" || { rm -rf "$tmp"; return 1; } + + cronet="$(find "$tmp" -type f -name 'libcronet*.so*' | head -n1 || true)" + [[ -n "$cronet" ]] && install -m 644 "$cronet" "$outdir/libcronet.so" || true + + rm -rf "$tmp" +} + +unify_geo_layout() { + local outroot="$1" + local n + local names=( + geosite.dat + geoip.dat + geoip-only-cn-private.dat + Country.mmdb + geoip.metadb + ) + + mkdir -p "$outroot/bin" + + for n in "${names[@]}"; do + if [[ -f "$outroot/bin/xray/$n" ]]; then + mv -f "$outroot/bin/xray/$n" "$outroot/bin/$n" + fi + done +} + +download_geo_assets() { + local outroot="$1" + local bin_dir="$outroot/bin" + local srss_dir="$bin_dir/srss" + local f="" + + mkdir -p "$bin_dir" "$srss_dir" + + echo "[+] Download Xray Geo to ${bin_dir}" + curl -fsSL -o "$bin_dir/geosite.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geosite.dat" + curl -fsSL -o "$bin_dir/geoip.dat" "https://github.com/Loyalsoldier/V2ray-rules-dat/releases/latest/download/geoip.dat" + curl -fsSL -o "$bin_dir/geoip-only-cn-private.dat" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/geoip-only-cn-private.dat" + curl -fsSL -o "$bin_dir/Country.mmdb" "https://raw.githubusercontent.com/Loyalsoldier/geoip/release/Country.mmdb" + + echo "[+] Download sing-box rule DB & rule-sets" + curl -fsSL -o "$bin_dir/geoip.metadb" "https://github.com/MetaCubeX/meta-rules-dat/releases/latest/download/geoip.metadb" + + for f in geoip-private.srs geoip-cn.srs geoip-facebook.srs geoip-fastly.srs geoip-google.srs geoip-netflix.srs geoip-telegram.srs geoip-twitter.srs; do + curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geoip/$f" + done + + for f in geosite-cn.srs geosite-gfw.srs geosite-google.srs geosite-greatfire.srs geosite-geolocation-cn.srs geosite-category-ads-all.srs geosite-private.srs; do + curl -fsSL -o "$srss_dir/$f" "https://raw.githubusercontent.com/2dust/sing-box-rules/refs/heads/rule-set-geosite/$f" + done + + unify_geo_layout "$outroot" +} + +populate_assets_zip_mode() { + local outroot="$1" + local rid="$2" + local url="" + local tmp="" + local nested_dir="" + + url="$(bundle_url_for_rid "$rid")" || { echo "[!] Bundle unsupported RID: $rid"; return 1; } + + echo "[+] Try v2rayN bundle archive: $url" + + tmp="$(mktemp -d)" + curl -fL "$url" -o "$tmp/v2rayn.zip" || { echo "[!] Bundle download failed"; rm -rf "$tmp"; return 1; } + unzip -q "$tmp/v2rayn.zip" -d "$tmp" || { echo "[!] Bundle unzip failed"; rm -rf "$tmp"; return 1; } + + if [[ -d "$tmp/bin" ]]; then + mkdir -p "$outroot/bin" + rsync -a "$tmp/bin/" "$outroot/bin/" + else + rsync -a "$tmp/" "$outroot/" + fi + + rm -f "$outroot/v2rayn.zip" 2>/dev/null || true + find "$outroot" -type d -name "mihomo" -prune -exec rm -rf {} + 2>/dev/null || true + + nested_dir="$(find "$outroot" -maxdepth 1 -type d -name 'v2rayN-linux-*' | head -n1 || true)" + if [[ -n "$nested_dir" && -d "$nested_dir/bin" ]]; then + mkdir -p "$outroot/bin" + rsync -a "$nested_dir/bin/" "$outroot/bin/" + rm -rf "$nested_dir" + fi + + unify_geo_layout "$outroot" + rm -rf "$tmp" + + echo "[+] Bundle extracted to $outroot" +} + +populate_assets_netcore_mode() { + local outroot="$1" + local rid="$2" + + mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box" + + if [[ "$WITH_CORE" == "xray" || "$WITH_CORE" == "both" ]]; then + download_xray "$outroot/bin/xray" "$rid" || echo "[!] xray download failed (skipped)" + fi + + if [[ "$WITH_CORE" == "sing-box" || "$WITH_CORE" == "both" ]]; then + download_singbox "$outroot/bin/sing_box" "$rid" || echo "[!] sing-box download failed (skipped)" + fi + + download_geo_assets "$outroot" || echo "[!] Geo rules download failed (skipped)" +} + +stage_runtime_assets() { + local outroot="$1" + local rid="$2" + + mkdir -p "$outroot/bin/xray" "$outroot/bin/sing_box" + + if [[ "$FORCE_NETCORE" -eq 0 ]]; then + if populate_assets_zip_mode "$outroot" "$rid"; then + echo "[*] Using v2rayN bundle archive." + else + echo "[*] Bundle failed, fallback to separate core + rules." + populate_assets_netcore_mode "$outroot" "$rid" + fi + else + echo "[*] --netcore specified: use separate core + rules." + populate_assets_netcore_mode "$outroot" "$rid" + fi +} + +describe_target() { + local short="$1" + + case "$short" in + loongarch64) printf '%s\n%s\n%s\n' "linux-loongarch64" "loongarch64" "loongarch64" ;; + *) echo "Unknown arch '$short' (use loongarch64)" >&2; return 1 ;; + esac +} + +publish_binary() { + local rid="$1" + + dotnet clean "$PROJECT" -c Release + rm -rf "$(dirname "$PROJECT")/bin/Release/net10.0" || true + dotnet restore "$PROJECT" + dotnet publish "$PROJECT" -c Release -r "$rid" -p:PublishSingleFile=false -p:SelfContained=true +} + +write_spec_file() { + local specfile="$1" + + cat > "$specfile" <<'SPEC' +%global debug_package %{nil} +%undefine _debuginfo_subpackages +%undefine _debugsource_packages +%global __requires_exclude ^liblttng-ust\.so\..*$ + +Name: v2rayN +Version: __VERSION__ +Release: 1%{?dist} +Summary: v2rayN (Avalonia) GUI client for Linux +License: GPL-3.0-only +URL: https://github.com/2dust/v2rayN +BugURL: https://github.com/2dust/v2rayN/issues +ExclusiveArch: loongarch64 +Source0: __PKGROOT__.tar.gz + +Requires: cairo, pango, openssl, mesa-libEGL, mesa-libGL +Requires: glibc >= 2.34 +Requires: fontconfig >= 2.13.1 +Requires: desktop-file-utils >= 0.26 +Requires: xdg-utils >= 1.1.3 +Requires: coreutils >= 8.32 +Requires: bash >= 5.1 +Requires: freetype >= 2.10 + +%description +v2rayN Linux for Red Hat Enterprise Linux +Support vless / vmess / Trojan / http / socks / Anytls / Hysteria2 / Shadowsocks / tuic / WireGuard +Support Red Hat Enterprise Linux / Fedora Linux / Rocky Linux / AlmaLinux / CentOS +For more information, Please visit our website +https://github.com/2dust/v2rayN + +%prep +%setup -q -n __PKGROOT__ + +%build + +%install +install -dm0755 %{buildroot}/opt/v2rayN +cp -a * %{buildroot}/opt/v2rayN/ + +find %{buildroot}/opt/v2rayN -type d -exec chmod 0755 {} + +find %{buildroot}/opt/v2rayN -type f -exec chmod 0644 {} + +[ -f %{buildroot}/opt/v2rayN/v2rayN ] && chmod 0755 %{buildroot}/opt/v2rayN/v2rayN || : + +install -dm0755 %{buildroot}%{_bindir} +install -m0755 /dev/stdin %{buildroot}%{_bindir}/v2rayn << 'EOF' +#!/usr/bin/bash +set -euo pipefail +DIR="/opt/v2rayN" + +if [[ -x "$DIR/v2rayN" ]]; then exec "$DIR/v2rayN" "$@"; fi + +for dll in v2rayN.Desktop.dll v2rayN.dll; do + if [[ -f "$DIR/$dll" ]]; then exec /usr/bin/dotnet "$DIR/$dll" "$@"; fi +done + +echo "v2rayN launcher: no executable found in $DIR" >&2 +ls -l "$DIR" >&2 || true +exit 1 +EOF + +install -dm0755 %{buildroot}%{_datadir}/applications +install -m0644 /dev/stdin %{buildroot}%{_datadir}/applications/v2rayn.desktop << 'EOF' +[Desktop Entry] +Type=Application +Name=v2rayN +Comment=v2rayN for Red Hat Enterprise Linux +Exec=v2rayn +Icon=v2rayn +Terminal=false +Categories=Network; +EOF + +install -dm0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps +install -m0644 %{_builddir}/__PKGROOT__/v2rayn.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png + +%post +/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true +/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true + +%postun +/usr/bin/update-desktop-database %{_datadir}/applications >/dev/null 2>&1 || true +/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor >/dev/null 2>&1 || true + +%files +%{_bindir}/v2rayn +/opt/v2rayN +%{_datadir}/applications/v2rayn.desktop +%{_datadir}/icons/hicolor/256x256/apps/v2rayn.png +SPEC + + sed -i "s/__VERSION__/${VERSION}/g" "$specfile" + sed -i "s/__PKGROOT__/${PKGROOT}/g" "$specfile" +} + +package_binary() { + local short="$1" + local rid="$2" + local rpm_target="$3" + local archdir="$4" + local pubdir="" + local workdir="" + local specfile="" + local sourcedir="" + local specdir="" + local project_dir="" + local icon_candidate="" + local f="" + + pubdir="$(dirname "$PROJECT")/bin/Release/net10.0/${rid}/publish" + [[ -d "$pubdir" ]] || { echo "Publish directory not found: $pubdir"; return 1; } + + workdir="$(mktemp -d)" + trap '[[ -n "${workdir:-}" ]] && rm -rf "$workdir"' RETURN + + mkdir -p "$workdir/$PKGROOT" + cp -a "$pubdir/." "$workdir/$PKGROOT/" + + project_dir="$(cd "$(dirname "$PROJECT")" && pwd)" + icon_candidate="$project_dir/v2rayN.png" + [[ -f "$icon_candidate" ]] || { echo "Required icon not found: $icon_candidate"; return 1; } + cp "$icon_candidate" "$workdir/$PKGROOT/v2rayn.png" + + stage_runtime_assets "$workdir/$PKGROOT" "$rid" + + rpmdev-setuptree + sourcedir="${RPM_TOPDIR}/SOURCES" + specdir="${RPM_TOPDIR}/SPECS" + specfile="${specdir}/v2rayN.spec" + + mkdir -p "$sourcedir" "$specdir" + tar -C "$workdir" -czf "$sourcedir/$PKGROOT.tar.gz" "$PKGROOT" + + write_spec_file "$specfile" + rpmbuild -ba "$specfile" --target "$rpm_target" + + echo "Build done for $short. RPM at:" + for f in "${RPM_TOPDIR}/RPMS/${archdir}/v2rayN-${VERSION}-1"*.rpm; do + [[ -e "$f" ]] || continue + echo " $f" + BUILT_RPMS+=("$f") + done +} + +select_targets() { + printf '%s\n' loongarch64 +} + +build_one_target() { + local short="$1" + local meta=() + local rid="" + local rpm_target="" + local archdir="" + + mapfile -t meta < <(describe_target "$short") || return 1 + rid="${meta[0]}" + rpm_target="${meta[1]}" + archdir="${meta[2]}" + + echo "[*] Building for target: $short (RID=$rid, RPM --target $rpm_target)" + publish_binary "$rid" + package_binary "$short" "$rid" "$rpm_target" "$archdir" +} + +print_summary() { + local rp="" + + echo "" + echo "================ Build Summary ================" + if [[ "${#BUILT_RPMS[@]}" -gt 0 ]]; then + for rp in "${BUILT_RPMS[@]}"; do + echo "$rp" + done + else + echo "No RPMs detected in summary (check build logs above)." + fi + echo "==============================================" +} + +main() { + local targets=() + local arch="" + + parse_args "$@" + detect_environment + install_dependencies + prepare_workspace + resolve_version + + mapfile -t targets < <(select_targets) + + for arch in "${targets[@]}"; do + build_one_target "$arch" + done + + print_summary +} + +main "$@" diff --git a/package-rhel-riscv.sh b/package-rhel-riscv.sh index 9c4fa03f..b65730c8 100644 --- a/package-rhel-riscv.sh +++ b/package-rhel-riscv.sh @@ -12,7 +12,7 @@ MIN_KERNEL="5.10" PKGROOT="v2rayN-publish" PROJECT_HINT="v2rayN.Desktop/v2rayN.Desktop.csproj" RPM_TOPDIR="${HOME}/rpmbuild" -DOTNET_RISCV_VERSION="10.0.108" +DOTNET_RISCV_VERSION="10.0.109" DOTNET_RISCV_BASE="https://github.com/xujiegb/dotnet-riscv/releases/download" DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz" DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}" @@ -501,7 +501,7 @@ write_spec_file() { Name: v2rayN Version: __VERSION__ Release: 1%{?dist} -Summary: v2rayN (Avalonia) GUI client for Linux (riscv64) +Summary: v2rayN (Avalonia) GUI client for Linux License: GPL-3.0-only URL: https://github.com/2dust/v2rayN BugURL: https://github.com/2dust/v2rayN/issues diff --git a/package-rhel.sh b/package-rhel.sh index 2b266999..1bca3774 100644 --- a/package-rhel.sh +++ b/package-rhel.sh @@ -490,7 +490,7 @@ write_spec_file() { Name: v2rayN Version: __VERSION__ Release: 1%{?dist} -Summary: v2rayN (Avalonia) GUI client for Linux (x86_64/aarch64) +Summary: v2rayN (Avalonia) GUI client for Linux License: GPL-3.0-only URL: https://github.com/2dust/v2rayN BugURL: https://github.com/2dust/v2rayN/issues @@ -698,4 +698,4 @@ main() { print_summary } -main "$@" \ No newline at end of file +main "$@"