diff --git a/.github/build-for-linux/build.sh b/.github/build-for-linux/build.sh index 6cdb18e..6389453 100644 --- a/.github/build-for-linux/build.sh +++ b/.github/build-for-linux/build.sh @@ -1,7 +1,7 @@ pnpm install pnpm check $INPUT_TARGET sed -i "s/#openssl/openssl={version=\"0.10\",features=[\"vendored\"]}/g" src-tauri/Cargo.toml -if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ] || [ "$INPUT_TARGET" = "i686-unknown-linux-gnu" ]; then +if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ]; then pnpm build --target $INPUT_TARGET else pnpm build --target $INPUT_TARGET -b deb diff --git a/.github/build-for-linux/entrypoint.sh b/.github/build-for-linux/entrypoint.sh index b482085..5a159ca 100644 --- a/.github/build-for-linux/entrypoint.sh +++ b/.github/build-for-linux/entrypoint.sh @@ -10,12 +10,6 @@ rustup target add "$INPUT_TARGET" if [ "$INPUT_TARGET" = "x86_64-unknown-linux-gnu" ]; then apt-get update apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libayatana-appindicator3-dev librsvg2-dev patchelf -elif [ "$INPUT_TARGET" = "i686-unknown-linux-gnu" ]; then - dpkg --add-architecture i386 - apt-get update - apt-get install -y libstdc++6:i386 libgdk-pixbuf2.0-dev:i386 libatomic1:i386 gcc-multilib g++-multilib libwebkit2gtk-4.0-dev:i386 libssl-dev:i386 libgtk-3-dev:i386 librsvg2-dev:i386 patchelf:i386 libayatana-appindicator3-dev:i386 - export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig/:$PKG_CONFIG_PATH - export PKG_CONFIG_SYSROOT_DIR=/ elif [ "$INPUT_TARGET" = "aarch64-unknown-linux-gnu" ]; then dpkg --add-architecture arm64 apt-get update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7509bb2..73fdeb6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,8 +18,6 @@ jobs: include: - os: windows-latest target: x86_64-pc-windows-msvc - - os: windows-latest - target: i686-pc-windows-msvc - os: windows-latest target: aarch64-pc-windows-msvc - os: macos-latest @@ -100,12 +98,8 @@ jobs: include: - os: ubuntu-latest target: x86_64-unknown-linux-gnu - - os: ubuntu-latest - target: i686-unknown-linux-gnu - os: ubuntu-latest target: aarch64-unknown-linux-gnu - # - os: ubuntu-latest - # target: armv7-unknown-linux-gnueabihf runs-on: ${{ matrix.os }} steps: - name: Checkout Repository @@ -124,7 +118,7 @@ jobs: sudo apt-get install jq echo "VERSION=$(cat package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV - name: Upload Release - if: startsWith(matrix.target, 'x86_64') || startsWith(matrix.target, 'i686') + if: startsWith(matrix.target, 'x86_64') uses: softprops/action-gh-release@v1 with: tag_name: v${{env.VERSION}} diff --git a/scripts/check.mjs b/scripts/check.mjs index fe9e357..f4f14b4 100644 --- a/scripts/check.mjs +++ b/scripts/check.mjs @@ -13,24 +13,20 @@ const FORCE = process.argv.includes("--force"); const PLATFORM_MAP = { "x86_64-pc-windows-msvc": "win32", - "i686-pc-windows-msvc": "win32", "aarch64-pc-windows-msvc": "win32", "x86_64-apple-darwin": "darwin", "aarch64-apple-darwin": "darwin", "x86_64-unknown-linux-gnu": "linux", - "i686-unknown-linux-gnu": "linux", "aarch64-unknown-linux-gnu": "linux", "armv7-unknown-linux-gnueabihf": "linux", "loongarch64-unknown-linux-gnu": "linux", }; const ARCH_MAP = { "x86_64-pc-windows-msvc": "x64", - "i686-pc-windows-msvc": "ia32", "aarch64-pc-windows-msvc": "arm64", "x86_64-apple-darwin": "x64", "aarch64-apple-darwin": "arm64", "x86_64-unknown-linux-gnu": "x64", - "i686-unknown-linux-gnu": "ia32", "aarch64-unknown-linux-gnu": "arm64", "armv7-unknown-linux-gnueabihf": "arm", "loongarch64-unknown-linux-gnu": "loong64", @@ -57,12 +53,10 @@ let META_ALPHA_VERSION; const META_ALPHA_MAP = { "win32-x64": "mihomo-windows-amd64-compatible", - "win32-ia32": "mihomo-windows-386", "win32-arm64": "mihomo-windows-arm64", "darwin-x64": "mihomo-darwin-amd64", "darwin-arm64": "mihomo-darwin-arm64", "linux-x64": "mihomo-linux-amd64-compatible", - "linux-ia32": "mihomo-linux-386", "linux-arm64": "mihomo-linux-arm64", "linux-arm": "mihomo-linux-armv7", "linux-loong64": "mihomo-linux-loong64", @@ -103,12 +97,10 @@ let META_VERSION; const META_MAP = { "win32-x64": "mihomo-windows-amd64-compatible", - "win32-ia32": "mihomo-windows-386", "win32-arm64": "mihomo-windows-arm64", "darwin-x64": "mihomo-darwin-amd64", "darwin-arm64": "mihomo-darwin-arm64", "linux-x64": "mihomo-linux-amd64-compatible", - "linux-ia32": "mihomo-linux-386", "linux-arm64": "mihomo-linux-arm64", "linux-arm": "mihomo-linux-armv7", "linux-loong64": "mihomo-linux-loong64", diff --git a/scripts/portable.mjs b/scripts/portable.mjs index 560a9b4..0af4fe9 100644 --- a/scripts/portable.mjs +++ b/scripts/portable.mjs @@ -7,7 +7,6 @@ import { getOctokit, context } from "@actions/github"; const target = process.argv.slice(2)[0]; const ARCH_MAP = { - "i686-pc-windows-msvc": "x86", "x86_64-pc-windows-msvc": "x64", "aarch64-pc-windows-msvc": "arm64", }; diff --git a/scripts/updater.mjs b/scripts/updater.mjs index 3db530f..8bf0ef7 100644 --- a/scripts/updater.mjs +++ b/scripts/updater.mjs @@ -45,11 +45,9 @@ async function resolveUpdater() { "darwin-intel": { signature: "", url: "" }, "darwin-x86_64": { signature: "", url: "" }, "linux-x86_64": { signature: "", url: "" }, - "linux-i686": { signature: "", url: "" }, "linux-aarch64": { signature: "", url: "" }, "linux-armv7": { signature: "", url: "" }, "windows-x86_64": { signature: "", url: "" }, - "windows-i686": { signature: "", url: "" }, "windows-aarch64": { signature: "", url: "" }, }, }; @@ -69,16 +67,6 @@ async function resolveUpdater() { updateData.platforms["windows-x86_64"].signature = sig; } - // win32 url - if (name.endsWith("x86-setup.nsis.zip")) { - updateData.platforms["windows-i686"].url = browser_download_url; - } - // win32 signature - if (name.endsWith("x86-setup.nsis.zip.sig")) { - const sig = await getSignature(browser_download_url); - updateData.platforms["windows-i686"].signature = sig; - } - // win arm url if (name.endsWith("arm64-setup.nsis.zip")) { updateData.platforms["windows-aarch64"].url = browser_download_url; @@ -130,16 +118,6 @@ async function resolveUpdater() { updateData.platforms["linux-aarch64"].signature = sig; updateData.platforms["linux-armv7"].signature = sig; } - - // linux x86 url - if (name.endsWith("i386.AppImage.tar.gz")) { - updateData.platforms["linux-i686"].url = browser_download_url; - } - // linux x86 signature - if (name.endsWith("i386.AppImage.tar.gz.sig")) { - const sig = await getSignature(browser_download_url); - updateData.platforms["linux-i686"].signature = sig; - } }); await Promise.allSettled(promises);