Merge pull request #176 from J-ZhengLi/luuuxxx

新增musl构建版本
J-ZhengLi · Dec 12, 2024 · 0b3bc2d · 0b3bc2d
2 parents e1a06df + d3fb185
commit 0b3bc2d
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,14 +20,22 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - name: dist-aarch64-linux
+          - name: dist-aarch64-linux-gnu
             os: ubuntu-20.04
             target: aarch64-unknown-linux-gnu
 
-          - name: dist-x86-64-linux
+          - name: dist-x86-64-linux-gnu
             os: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
 
+          - name: dist-aarch64-linux-musl
+            os: ubuntu-20.04
+            target: aarch64-unknown-linux-musl
+
+          - name: dist-x86-64-linux-musl
+            os: ubuntu-20.04
+            target: x86_64-unknown-linux-musl
+
           - name: dist-windows-msvc
             os: windows-latest
             target: x86_64-pc-windows-msvc
@@ -38,10 +46,18 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU for ARM64
-        if: matrix.target == 'aarch64-unknown-linux-gnu'
+        if: contains(matrix.target, 'aarch64')
         uses: docker/setup-qemu-action@v2
         with:
           platforms: aarch64
+
+      - name: Set up QEMU for multiple cores
+        if: contains(matrix.target, 'aarch64')
+        run: |
+          echo "Setting up QEMU with multiple cores"
+          export QEMU_CPUS=4  # 设置虚拟 CPU 核心数为 4
+          # 设置 QEMU 使用多个核心
+          echo "Using $QEMU_CPUS CPUs with QEMU"
 
       - name: run build job
         run: bash ci/run.sh

diff --git a/ci/docker/dist-aarch64-linux/Dockerfile → ci/docker/dist-aarch64-linux-gnu/Dockerfile b/ci/docker/dist-aarch64-linux/Dockerfile → ci/docker/dist-aarch64-linux-gnu/Dockerfile
@@ -31,7 +31,10 @@ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
 RUN npm set strict-ssl false && npm install -g pnpm
 
 # 安装 Tauri CLI
-RUN cargo install [email protected]
+# RUN cargo install [email protected]
+COPY ci/scripts/install-tauri-cli.sh /scripts/
+RUN chmod +x /scripts/install-tauri-cli.sh && \
+    /scripts/install-tauri-cli.sh
 
 # 执行项目构建
 CMD cargo dev vendor && \

diff --git a/ci/docker/dist-aarch64-linux-musl/Dockerfile b/ci/docker/dist-aarch64-linux-musl/Dockerfile
@@ -0,0 +1,43 @@
+# 使用 Ubuntu 20.04 ARM 版本作为基础镜像
+FROM arm64v8/ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# 更新系统并安装必要的软件包
+RUN apt-get update && \
+    apt-get install -y \
+      make \
+      curl \
+      wget \
+      file \
+      libssl-dev \
+      libgtk-3-dev \
+      libwebkit2gtk-4.0-dev \
+      libappindicator3-dev \
+      librsvg2-dev \
+      perl \
+      musl-tools
+
+# 安装 Rust（确保是适用于 ARM 的目标）
+COPY ci/scripts/install-rust.sh /scripts/
+RUN chmod +x /scripts/install-rust.sh && \
+    /scripts/install-rust.sh
+ENV PATH=$PATH:/root/.cargo/bin
+
+RUN rustup target add aarch64-unknown-linux-musl
+ENV HOST_TRIPPLE aarch64-unknown-linux-musl
+
+# 安装 Node.js 18.x
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
+    apt-get install -y nodejs
+RUN npm set strict-ssl false && npm install -g pnpm
+
+# 安装 Tauri CLI
+# RUN cargo install [email protected]
+COPY ci/scripts/install-tauri-cli.sh /scripts/
+RUN chmod +x /scripts/install-tauri-cli.sh && \
+    /scripts/install-tauri-cli.sh
+
+# 执行项目构建
+CMD cargo dev vendor && \
+    cargo dev dist
diff --git a/ci/docker/dist-x86-64-linux/Dockerfile → ci/docker/dist-x86-64-linux-gnu/Dockerfile b/ci/docker/dist-x86-64-linux/Dockerfile → ci/docker/dist-x86-64-linux-gnu/Dockerfile
@@ -31,7 +31,10 @@ RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
 RUN npm set strict-ssl false && npm install -g pnpm
 
 # 安装 Tauri CLI
-RUN cargo install [email protected]
+# RUN cargo install [email protected]
+COPY ci/scripts/install-tauri-cli.sh /scripts/
+RUN chmod +x /scripts/install-tauri-cli.sh && \
+    /scripts/install-tauri-cli.sh
 
 # 执行项目构建
 CMD cargo dev vendor && \

diff --git a/ci/docker/dist-x86-64-linux-musl/Dockerfile b/ci/docker/dist-x86-64-linux-musl/Dockerfile
@@ -0,0 +1,43 @@
+# 使用 Ubuntu 20.04 作为基础镜像
+FROM ubuntu:20.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# 更新系统并安装必要的软件包
+RUN apt-get update && \
+    apt-get install -y \
+      make \
+      curl \
+      wget \
+      file \
+      libssl-dev \
+      libgtk-3-dev \
+      libwebkit2gtk-4.0-dev \
+      libappindicator3-dev \
+      librsvg2-dev \
+      perl \
+      musl-tools
+
+# 安装 Rust
+COPY ci/scripts/install-rust.sh /scripts/
+RUN chmod +x /scripts/install-rust.sh && \
+    /scripts/install-rust.sh
+ENV PATH=$PATH:/root/.cargo/bin
+
+RUN rustup target add x86_64-unknown-linux-musl
+ENV HOST_TRIPPLE x86_64-unknown-linux-musl
+
+# 安装 Node.js 18.x
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
+    apt-get install -y nodejs
+RUN npm set strict-ssl false && npm install -g pnpm
+
+# 安装 Tauri CLI
+# RUN cargo install [email protected]
+COPY ci/scripts/install-tauri-cli.sh /scripts/
+RUN chmod +x /scripts/install-tauri-cli.sh && \
+    /scripts/install-tauri-cli.sh
+
+# 执行项目构建
+CMD cargo dev vendor && \
+    cargo dev dist
diff --git a/ci/scripts/install-tauri-cli.sh b/ci/scripts/install-tauri-cli.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+mkdir ./cargo_tauri
+
+if [ "$(uname -s)" = "Linux" ]; then
+    if [ "$(uname -m)" = "x86_64" ]; then
+        curl -OL https://github.com/LuuuXXX/tauri-mirror/releases/download/tauri-cli-v1.6.3/cargo-tauri-x86_64-unknown-linux-gnu.tgz
+        tar -xf cargo-tauri-x86_64-unknown-linux-gnu.tgz -C ./cargo_tauri
+    else
+        curl -OL https://github.com/LuuuXXX/tauri-mirror/releases/download/tauri-cli-v1.6.3/cargo-tauri-aarch64-unknown-linux-gnu.tgz
+        tar -xf cargo-tauri-aarch64-unknown-linux-gnu.tgz -C ./cargo_tauri
+    fi
+    mv ./cargo_tauri/cargo-tauri ~/.cargo/bin
+else
+    curl -OL https://github.com/LuuuXXX/tauri-mirror/releases/download/tauri-cli-v1.6.3/cargo-tauri-x86_64-pc-windows-msvc.zip
+    unzip cargo-tauri-x86_64-pc-windows-msvc.zip -d ./cargo_tauri
+    mv ./cargo_tauri/cargo-tauri.exe ~/.cargo/bin
+fi
+
+rm -r ./cargo_tauri
diff --git a/ci/scripts/run-with-docker.sh b/ci/scripts/run-with-docker.sh
@@ -41,9 +41,16 @@ else
     echo "Invalid docker image: $image"
 fi
 
-# run ther docker image.
+# 运行 Docker 容器
 if [[ "$image" == *"aarch64"* ]]; then
-    docker run --platform linux/arm64 --workdir /checkout/obj -v "$source_dir:/checkout/obj" --init --rm rim-ci 
+  # 设置 QEMU_CPUS 环境变量并运行容器，支持多核配置
+  docker run -e QEMU_CPUS=${QEMU_CPUS:-4} --platform linux/arm64 \
+    --workdir /checkout/obj \
+    -v "$source_dir:/checkout/obj" \
+    --init --rm rim-ci
 else
-    docker run --workdir /checkout/obj -v "$source_dir:/checkout/obj" --init --rm rim-ci
+  # 默认处理其他架构
+  docker run --workdir /checkout/obj \
+    -v "$source_dir:/checkout/obj" \
+    --init --rm rim-ci
 fi
diff --git a/ci/scripts/run-without-docker.sh b/ci/scripts/run-without-docker.sh
@@ -12,7 +12,8 @@ sh ci/scripts/install-nodejs.sh
 npm set strict-ssl false && npm install -g pnpm
 
 # 安装 Tauri CLI
-cargo install [email protected]
+# cargo install [email protected]
+sh ci/scripts/install-tauri-cli.sh
 
 echo "Execiting cargo dev vendor"
 cargo dev vendor