From dc82d07c288b7e949081be49cc9a89cd3f23f8e1 Mon Sep 17 00:00:00 2001 From: 简律纯 Date: Tue, 20 Jan 2026 13:46:37 +0800 Subject: chore: Update CI workflow to include dev branch and platforms --- .github/workflows/semifold-ci.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index 7938a9d..6f496f0 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -1,7 +1,7 @@ name: Semifold CI on: push: - branches: [main] + branches: [main, dev] env: CARGO_TERM_COLOR: always @@ -24,10 +24,10 @@ jobs: name: "Linux x86_64 (GNU)" target: "x86_64-unknown-linux-gnu" args: "--target x86_64-unknown-linux-gnu" - # - platform: "ubuntu-latest" - # name: "Linux x86_64 (Musl)" - # target: "x86_64-unknown-linux-musl" - # args: "--target x86_64-unknown-linux-musl" + - platform: "ubuntu-latest" + name: "Linux x86_64 (Musl)" + target: "x86_64-unknown-linux-musl" + args: "--target x86_64-unknown-linux-musl" - platform: "ubuntu-24.04-arm" name: "Linux arm64" target: "aarch64-unknown-linux-gnu" @@ -46,10 +46,10 @@ jobs: name: "Windows x86_64 (MSVC)" target: "x86_64-pc-windows-msvc" args: "--target x86_64-pc-windows-msvc --bundles nsis" - # - platform: "windows-latest" - # name: "Windows x86_64 (GNU)" - # target: "x86_64-pc-windows-gnu" - # args: "--target x86_64-pc-windows-gnu --bundles nsis" + - platform: "windows-latest" + name: "Windows x86_64 (GNU)" + target: "x86_64-pc-windows-gnu" + args: "--target x86_64-pc-windows-gnu --bundles nsis" - platform: "windows-11-arm" name: "Windows arm64" target: "aarch64-pc-windows-msvc" -- cgit v1.2.3-70-g09d2 From cf71adf8b02397ff14445c8f8b659ee519c60c50 Mon Sep 17 00:00:00 2001 From: HsiangNianian Date: Tue, 20 Jan 2026 14:01:16 +0800 Subject: fix(ci): Add rustflags for Windows builds and install musl-tools for Linux --- .github/workflows/semifold-ci.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index 6f496f0..89d9e7e 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -50,6 +50,7 @@ jobs: name: "Windows x86_64 (GNU)" target: "x86_64-pc-windows-gnu" args: "--target x86_64-pc-windows-gnu --bundles nsis" + rustflags: "-C link-arg=-lws2_32" - platform: "windows-11-arm" name: "Windows arm64" target: "aarch64-pc-windows-msvc" @@ -64,6 +65,9 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libfuse2 + if [ "${{ matrix.target }}" = "x86_64-unknown-linux-musl" ]; then + sudo apt-get install -y musl-tools pkg-config + fi - name: Install pnpm uses: pnpm/action-setup@v4 @@ -104,6 +108,8 @@ jobs: uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RUSTFLAGS: ${{ matrix.rustflags || '' }} + PKG_CONFIG_PATH: ${{ (matrix.target == 'x86_64-unknown-linux-musl') && '/usr/lib/x86_64-linux-musl/pkgconfig' || '' }} with: args: ${{ matrix.args }} -- cgit v1.2.3-70-g09d2 From d2624887ca74e77ad524098c38114e3a7c91f065 Mon Sep 17 00:00:00 2001 From: HsiangNianian Date: Tue, 20 Jan 2026 14:09:06 +0800 Subject: fix(ci): Enable cross compilation for musl builds and streamline dependency installation --- .github/workflows/semifold-ci.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index 89d9e7e..b820a78 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -28,6 +28,7 @@ jobs: name: "Linux x86_64 (Musl)" target: "x86_64-unknown-linux-musl" args: "--target x86_64-unknown-linux-musl" + use-cross: true - platform: "ubuntu-24.04-arm" name: "Linux arm64" target: "aarch64-unknown-linux-gnu" @@ -65,9 +66,6 @@ jobs: run: | sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libfuse2 - if [ "${{ matrix.target }}" = "x86_64-unknown-linux-musl" ]; then - sudo apt-get install -y musl-tools pkg-config - fi - name: Install pnpm uses: pnpm/action-setup@v4 @@ -87,6 +85,10 @@ jobs: with: targets: ${{ matrix.target }} + - name: Install cross (for musl builds) + if: matrix.use-cross == true + run: cargo install cross + - name: Rust Cache uses: swatinem/rust-cache@v2 with: @@ -109,9 +111,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RUSTFLAGS: ${{ matrix.rustflags || '' }} - PKG_CONFIG_PATH: ${{ (matrix.target == 'x86_64-unknown-linux-musl') && '/usr/lib/x86_64-linux-musl/pkgconfig' || '' }} + CARGO_BUILD_TARGET: ${{ matrix.target }} with: args: ${{ matrix.args }} + command: ${{ matrix.use-cross && 'cross' || 'cargo' }} - name: Fix AppImage for Wayland (Linux) if: startsWith(matrix.platform, 'ubuntu') && !startsWith(matrix.platform, 'macos') && !startsWith(matrix.platform, 'windows') -- cgit v1.2.3-70-g09d2