replace yarn with pnpm (#85)

* 🐳 chore: replace yarn with pnpm

.github/workflows/rust.yml

@@ -2,9 +2,9 @@ name: Rust
 
 on:
   push:
-    branches: [ "develop", "main" ]
+    branches: ["develop", "main"]
   pull_request:
-    branches: [ "develop", "main" ]
+    branches: ["develop", "main"]
 
 env:
   CARGO_TERM_COLOR: always
@@ -32,12 +32,14 @@ jobs:
           - TARGET: mipsel-unknown-linux-musl
             OS: ubuntu-latest
             GUI_TARGET:
+
           - TARGET: x86_64-apple-darwin
             OS: macos-latest
             GUI_TARGET: x86_64-apple-darwin
           - TARGET: aarch64-apple-darwin
             OS: macos-latest
             GUI_TARGET: aarch64-apple-darwin
+
           - TARGET: x86_64-pc-windows-msvc
             OS: windows-latest
             GUI_TARGET: x86_64-pc-windows-msvc
@@ -50,25 +52,43 @@ jobs:
       OSS_BUCKET: ${{ secrets.ALIYUN_OSS_BUCKET }}
     steps:
       - uses: actions/checkout@v3
-    - name: Setup protoc
-      uses: arduino/setup-protoc@v2
-      with:
-         # GitHub repo token to use to avoid rate limiter
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - uses: actions/setup-node@v4
         with:
           node-version: 21
-        cache: 'yarn'
-        cache-dependency-path: easytier-gui/yarn.lock
-    - name: Install Yarn
-      run: npm install -g yarn
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v3
+        with:
+          version: 9
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install frontend dependencies
+        run: |
+          cd easytier-gui
+          pnpm install
+
       - name: Cargo cache
-      uses: actions/cache@v4.0.0
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
             ./target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+
       - name: Install rust target
         run: |
           # dependencies are only needed on ubuntu as that's the only place where
@@ -76,6 +96,7 @@ jobs:
           if [[ $OS =~ ^ubuntu.*$ ]]; then
             sudo apt-get update && sudo apt-get install -qq crossbuild-essential-arm64 crossbuild-essential-armhf musl-tools
             # for easytier-gui
+            if [[ $GUI_TARGET != '' ]]; then
               sudo apt install libwebkit2gtk-4.0-dev \
                   build-essential \
                   curl \
@@ -84,7 +105,9 @@ jobs:
                   libssl-dev \
                   libgtk-3-dev \
                   libayatana-appindicator3-dev \
-              librsvg2-dev
+                  librsvg2-dev \
+                  patchelf
+            fi
             #  curl -s musl.cc | grep mipsel
             case $TARGET in 
               mipsel-unknown-linux-musl)
@@ -134,18 +157,25 @@ jobs:
             rustup target add $TARGET
             rustup target add $GUI_TARGET
           fi
-    - name: Run build
+
+      - name: Setup protoc
+        uses: arduino/setup-protoc@v2
+        with:
+          # GitHub repo token to use to avoid rate limiter
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Core & Cli
         run: |
           if [[ $OS =~ ^ubuntu.*$ && $TARGET =~ ^mips.*$ ]]; then
             cargo +nightly build -r --verbose --target $TARGET -Z build-std --no-default-features --features mips
           else
             cargo build --release --verbose --target $TARGET
           fi
-    - name: Install for aarch64 gui cross compile
+
+      - name: Install GUI cross compile (aarch64 only)
+        if: ${{ matrix.TARGET == 'aarch64-unknown-linux-musl' }}
         run: |
           # see https://tauri.app/v1/guides/building/linux/
-        if [[ $TARGET == "aarch64-unknown-linux-musl" ]]; then
-
           echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted" | sudo tee /etc/apt/sources.list
           echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted" | sudo tee -a /etc/apt/sources.list
           echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy universe" | sudo tee -a /etc/apt/sources.list
@@ -173,20 +203,15 @@ jobs:
           sudo apt install libwebkit2gtk-4.0-dev:arm64
           sudo apt install libssl-dev:arm64
           echo "PKG_CONFIG_SYSROOT_DIR=/usr/aarch64-linux-gnu/" >> "$GITHUB_ENV"
-        fi
-    - name: Run build GUI
-      run: |
-        if [ ! -n "$GUI_TARGET" ]; then
-          exit 0
-        fi
-        cd easytier-gui
-        yarn install
-        if [[ $OS =~ ^ubuntu.*$ && ! $GUI_TARGET =~ ^x86_64.*$ ]]; then
-          # only build deb for non-x86_64 linux
-          yarn tauri build -- --target $GUI_TARGET --verbose --bundles deb
-        else
-          yarn tauri build -- --target $GUI_TARGET --verbose
-        fi
+
+      - name: Build GUI
+        if: ${{ matrix.GUI_TARGET != '' }}
+        uses: tauri-apps/tauri-action@v0
+        with:
+          projectPath: ./easytier-gui
+          # https://tauri.app/v1/guides/building/linux/#cross-compiling-tauri-applications-for-arm-based-devices
+          args: --verbose --target ${{ matrix.GUI_TARGET }} ${{ matrix.OS == 'ubuntu-latest' && contains(matrix.TARGET, 'aarch64') && '--bundles deb' || ''  }}
+
       - name: Compress
         run: |
           mkdir -p ./artifacts/objects/
@@ -219,12 +244,14 @@ jobs:
 
           tar -cvf ./artifacts/$NAME-$TARGET-$TAG.tar -C ./artifacts/objects/ .
           rm -rf ./artifacts/objects/
+
       - name: Archive artifact
         uses: actions/upload-artifact@v4
         with:
           name: easytier-${{ matrix.OS }}-${{ matrix.TARGET }}
           path: |
             ./artifacts/*
+
       - name: Upload OSS
         if: ${{ env.OSS_BUCKET != '' }}
         uses: Menci/upload-to-oss@main
@@ -241,26 +268,31 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+
       - name: Setup protoc
         uses: arduino/setup-protoc@v2
         with:
           # GitHub repo token to use to avoid rate limiter
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Setup tools for test
         run: sudo apt install bridge-utils
+
       - name: Setup system for test
         run: |
           sudo sysctl net.bridge.bridge-nf-call-iptables=0
           sudo sysctl net.bridge.bridge-nf-call-ip6tables=0
           sudo sysctl net.ipv6.conf.lo.disable_ipv6=0
           sudo ip addr add 2001:db8::2/64 dev lo
+
       - name: Cargo cache
-      uses: actions/cache@v4.0.0
+        uses: actions/cache@v4
         with:
           path: |
             ~/.cargo
             ./target
           key: ${{ runner.os }}-cargo-test-${{ hashFiles('**/Cargo.lock') }}
+
       - name: Run tests
         run: |
           sudo -E env "PATH=$PATH" cargo test --verbose

easytier-gui/.npmrc

@@ -0,0 +1,2 @@
+shamefully-hoist=true
+strict-peer-dependencies=false

easytier-gui/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "build": {
-    "beforeDevCommand": "yarn dev",
-    "beforeBuildCommand": "yarn build",
+    "beforeDevCommand": "pnpm dev",
+    "beforeBuildCommand": "pnpm build",
     "devPath": "http://localhost:1420",
     "distDir": "../dist"
   },