|
@@ -26,12 +26,6 @@ jobs:
|
|
target: aarch64-apple-darwin
|
|
target: aarch64-apple-darwin
|
|
- os: macos-latest
|
|
- os: macos-latest
|
|
target: x86_64-apple-darwin
|
|
target: x86_64-apple-darwin
|
|
- - os: ubuntu-latest
|
|
|
|
- target: x86_64-unknown-linux-gnu
|
|
|
|
- - os: ubuntu-latest
|
|
|
|
- target: aarch64-unknown-linux-gnu
|
|
|
|
- # - os: ubuntu-latest
|
|
|
|
- # target: armv7-unknown-linux-gnueabihf
|
|
|
|
|
|
|
|
runs-on: ${{ matrix.os }}
|
|
runs-on: ${{ matrix.os }}
|
|
steps:
|
|
steps:
|
|
@@ -61,36 +55,6 @@ jobs:
|
|
version: 8
|
|
version: 8
|
|
run_install: false
|
|
run_install: false
|
|
|
|
|
|
- - name: Install Dependencies (Ubuntu Only)
|
|
|
|
- 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 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] 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] 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: Install Dependencies (Ubuntu Only)
|
|
|
|
- if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.target,'armv7')
|
|
|
|
- run: |
|
|
|
|
- sed 's/mirror+file:\/etc\/apt\/apt-mirrors.txt/[arch-=amd64] 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] mirror+file/g' /etc/apt/sources.list
|
|
|
|
- cat /etc/apt/sources.list
|
|
|
|
- cat /etc/apt/sources.list.d/ports.list
|
|
|
|
- sudo dpkg --add-architecture armhf
|
|
|
|
- sudo apt-get update
|
|
|
|
- sudo apt-get install -y libncurses6:armhf libtinfo6:armhf linux-libc-dev:armhf libncursesw6:armhf libssl3:armhf libcups2:armhf
|
|
|
|
- sudo apt-get install -y --no-install-recommends g++-arm-linux-gnueabihf libc6-dev-armhf-cross libssl-dev:armhf libwebkit2gtk-4.0-dev:armhf libgtk-3-dev:armhf patchelf:armhf librsvg2-dev:armhf libayatana-appindicator3-dev:armhf
|
|
|
|
-
|
|
|
|
- name: Pnpm install and check
|
|
- name: Pnpm install and check
|
|
run: |
|
|
run: |
|
|
pnpm i
|
|
pnpm i
|
|
@@ -112,57 +76,63 @@ jobs:
|
|
tauriScript: pnpm
|
|
tauriScript: pnpm
|
|
args: --target ${{ matrix.target }}
|
|
args: --target ${{ matrix.target }}
|
|
|
|
|
|
- - name: Tauri build (Ubuntu Arm64)
|
|
|
|
- if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.target,'aarch64')
|
|
|
|
- uses: tauri-apps/tauri-action@v0
|
|
|
|
|
|
+ - name: Portable Bundle
|
|
|
|
+ if: matrix.os == 'windows-latest'
|
|
|
|
+ run: |
|
|
|
|
+ pnpm portable ${{ matrix.target }}
|
|
env:
|
|
env:
|
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
|
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
|
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: --target ${{ matrix.target }} -b deb,updater
|
|
|
|
|
|
+ VITE_WIN_PORTABLE: 1
|
|
|
|
|
|
- - name: Tauri build (Ubuntu Armv7)
|
|
|
|
- if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.target,'armv7')
|
|
|
|
- uses: tauri-apps/tauri-action@v0
|
|
|
|
|
|
+ release-for-linux:
|
|
|
|
+ strategy:
|
|
|
|
+ fail-fast: false
|
|
|
|
+ matrix:
|
|
|
|
+ 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
|
|
|
|
+ uses: actions/checkout@v4
|
|
|
|
+
|
|
|
|
+ - name: Build for Linux
|
|
|
|
+ uses: ./.github/build-for-linux
|
|
env:
|
|
env:
|
|
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
|
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
|
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
|
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
|
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
|
- CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
|
|
|
|
- CC_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc
|
|
|
|
- CXX_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-g++
|
|
|
|
- PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig
|
|
|
|
- PKG_CONFIG_ALLOW_CROSS: 1
|
|
|
|
with:
|
|
with:
|
|
- tagName: v__VERSION__
|
|
|
|
- releaseName: "Clash Verge v__VERSION__"
|
|
|
|
- releaseBody: "More new features are now supported."
|
|
|
|
- releaseDraft: false
|
|
|
|
- prerelease: false
|
|
|
|
- tauriScript: pnpm
|
|
|
|
- args: --target ${{ matrix.target }} -b deb,updater
|
|
|
|
-
|
|
|
|
- - name: Portable Bundle
|
|
|
|
- if: matrix.os == 'windows-latest'
|
|
|
|
|
|
+ target: ${{ matrix.target }}
|
|
|
|
+ - name: Get Version
|
|
run: |
|
|
run: |
|
|
- pnpm portable ${{ matrix.target }}
|
|
|
|
- env:
|
|
|
|
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
|
|
- TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
|
|
|
|
- TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
|
|
|
|
- VITE_WIN_PORTABLE: 1
|
|
|
|
|
|
+ sudo apt-get update
|
|
|
|
+ sudo apt-get install jq
|
|
|
|
+ echo "VERSION=$(cat package.json | jq '.version')" >> $GITHUB_ENV
|
|
|
|
+ - name: Upload Release
|
|
|
|
+ if: startsWith(matrix.target, 'x86_64')
|
|
|
|
+ uses: softprops/action-gh-release@v1
|
|
|
|
+ with:
|
|
|
|
+ tag_name: v${{env.VERSION}}
|
|
|
|
+ name: "Clash Verge v${{env.VERSION}}"
|
|
|
|
+ body: "More new features are now supported."
|
|
|
|
+ token: ${{ secrets.GITHUB_TOKEN }}
|
|
|
|
+ files: src-tauri/target/${{ matrix.target }}/release/bundle/appimage/*.AppImage*
|
|
|
|
+ - name: Upload Release
|
|
|
|
+ uses: softprops/action-gh-release@v1
|
|
|
|
+ with:
|
|
|
|
+ tag_name: v${{env.VERSION}}
|
|
|
|
+ name: "Clash Verge v${{env.VERSION}}"
|
|
|
|
+ body: "More new features are now supported."
|
|
|
|
+ token: ${{ secrets.GITHUB_TOKEN }}
|
|
|
|
+ files: src-tauri/target/${{ matrix.target }}/release/bundle/deb/*.deb
|
|
|
|
|
|
release-update:
|
|
release-update:
|
|
needs: [release]
|
|
needs: [release]
|