diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55a5735e..d48c5405 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,17 +15,33 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, ubuntu-latest, macos-latest] + include: + - os: windows-latest + target: x86_64-pc-windows-msvc + # - os: windows-latest + # target: aarch64-pc-windows-msvc + - os: macos-latest + target: aarch64-apple-darwin + - os: macos-latest + target: x86_64-apple-darwin + - os: ubuntu-latest + target: x86_64-unknown-linux-gnu + - os: ubuntu-latest + target: aarch64-unknown-linux-gnu runs-on: ${{ matrix.os }} if: startsWith(github.repository, 'wonfen') steps: - - name: Checkout repository + - name: Checkout Repository uses: actions/checkout@v4 - - name: install Rust stable + - name: Install Rust Stable uses: dtolnay/rust-toolchain@stable + - name: Add Rust Target + run: | + rustup target add ${{ matrix.target }} + - name: Rust Cache uses: Swatinem/rust-cache@v2 with: @@ -43,17 +59,30 @@ jobs: run_install: false - name: Install Dependencies (Ubuntu Only) - if: startsWith(matrix.os, 'ubuntu-') + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.target,'x86_64') run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf openssl + sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf openssl + + - name: Install Dependencies (Ubuntu Only) + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.target,'aarch64') + run: | + sed 's/mirror+file:\/etc\/apt\/apt-mirrors.txt/[arch-=amd64,i386] http:\/\/ports.ubuntu.com\/ubuntu-ports\//g' /etc/apt/sources.list | sudo tee /etc/apt/sources.list.d/ports.list + sudo sed -i 's/mirror+file/[arch=amd64,i386] mirror+file/g' /etc/apt/sources.list + cat /etc/apt/sources.list + cat /etc/apt/sources.list.d/ports.list + sudo dpkg --add-architecture arm64 + sudo apt-get update + sudo apt-get install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libssl3:arm64 libcups2:arm64 + sudo apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libssl-dev:arm64 libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64 - name: Pnpm install and check run: | pnpm i - pnpm check + pnpm check ${{ matrix.target }} - name: Tauri build + if: startsWith(matrix.os, 'windows') || startsWith(matrix.os,'macos') || startsWith(matrix.target,'x86_64') uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -66,7 +95,28 @@ jobs: releaseDraft: false prerelease: false tauriScript: pnpm - args: -f default-meta + args: -f default-meta --target ${{ matrix.target }} + + - name: Tauri build (Ubuntu Arm64) + if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.target,'aarch64') + uses: tauri-apps/tauri-action@v0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc + CC_aarch64_unknown_linux_gnu: aarch64-linux-gnu-gcc + CXX_aarch64_unknown_linux_gnu: aarch64-linux-gnu-g++ + PKG_CONFIG_PATH: /usr/lib/aarch64-linux-gnu/pkgconfig + PKG_CONFIG_ALLOW_CROSS: 1 + with: + tagName: v__VERSION__ + releaseName: "Clash Verge v__VERSION__" + releaseBody: "More new features are now supported." + releaseDraft: false + prerelease: false + tauriScript: pnpm + args: -f default-meta --target ${{ matrix.target }} -b deb,updater - name: Portable Bundle if: matrix.os == 'windows-latest' diff --git a/scripts/check.mjs b/scripts/check.mjs index 48f1b1c8..e660ca41 100644 --- a/scripts/check.mjs +++ b/scripts/check.mjs @@ -11,10 +11,6 @@ const cwd = process.cwd(); const TEMP_DIR = path.join(cwd, "node_modules/.verge"); const FORCE = process.argv.includes("--force"); -const SIDECAR_HOST = execSync("rustc -vV") - .toString() - .match(/(?<=host: ).+(?=\s*)/g)[0]; - /* ======= clash ======= const CLASH_STORAGE_PREFIX = "https://release.dreamacro.workers.dev/"; const CLASH_URL_PREFIX = @@ -42,6 +38,7 @@ const META_URL_PREFIX = `https://github.com/wonfen/Clash.Meta/releases/download/ const META_MAP = { "win32-x64": "clash.meta-win-amd64", + "win32-arm64": "clash.meta-win-arm64", "darwin-x64": "clash.meta-darwin-amd64", "darwin-arm64": "clash.meta-darwin-arm64", "linux-x64": "clash.meta-linux-amd64", @@ -51,8 +48,33 @@ const META_MAP = { /* * check available */ +const PLATFORM_MAP = { + "x86_64-pc-windows-msvc": "win32", + "aarch64-pc-windows-msvc": "win32", + "x86_64-apple-darwin": "darwin", + "aarch64-apple-darwin": "darwin", + "x86_64-unknown-linux-gnu": "linux", + "aarch64-unknown-linux-gnu": "linux", +}; +const ARCH_MAP = { + "x86_64-pc-windows-msvc": "x64", + "aarch64-pc-windows-msvc": "arm64", + "x86_64-apple-darwin": "x64", + "aarch64-apple-darwin": "arm64", + "x86_64-unknown-linux-gnu": "x64", + "aarch64-unknown-linux-gnu": "arm64", +}; -const { platform, arch } = process; +const target = process.argv.slice(2)[0]; +const { platform, arch } = target + ? { platform: PLATFORM_MAP[target], arch: ARCH_MAP[target] } + : process; + +const SIDECAR_HOST = target + ? target + : execSync("rustc -vV") + .toString() + .match(/(?<=host: ).+(?=\s*)/g)[0]; /* if (!CLASH_MAP[`${platform}-${arch}`]) { throw new Error(`clash unsupported platform "${platform}-${arch}"`); diff --git a/scripts/updater.mjs b/scripts/updater.mjs index dad9271a..e2c5ec3d 100644 --- a/scripts/updater.mjs +++ b/scripts/updater.mjs @@ -45,6 +45,7 @@ async function resolveUpdater() { "darwin-intel": { signature: "", url: "" }, "darwin-x86_64": { signature: "", url: "" }, "linux-x86_64": { signature: "", url: "" }, + "linux-aarch64": { signature: "", url: "" }, "windows-x86_64": { signature: "", url: "" }, }, }; @@ -92,12 +93,16 @@ async function resolveUpdater() { if (name.endsWith(".AppImage.tar.gz")) { updateData.platforms.linux.url = browser_download_url; updateData.platforms["linux-x86_64"].url = browser_download_url; + // 暂时使用x64版本的url和sig，使得可以检查更新，但aarch64版本还不支持构建appimage + updateData.platforms["linux-aarch64"].url = browser_download_url; } // linux signature if (name.endsWith(".AppImage.tar.gz.sig")) { const sig = await getSignature(browser_download_url); updateData.platforms.linux.signature = sig; updateData.platforms["linux-x86_64"].signature = sig; + // 暂时使用x64版本的url和sig，使得可以检查更新，但aarch64版本还不支持构建appimage + updateData.platforms["linux-aarch64"].url = browser_download_url; } });