From 3bc1e77f3922d5bdb824d1249971738a8d175f41 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 10 Feb 2026 13:27:03 +0800 Subject: fix(ci): configure musl cross-compilation for GTK dependencies (#92) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: HsiangNianian <44714368+HsiangNianian@users.noreply.github.com> --- .github/workflows/semifold-ci.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index b820a78..9a91518 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -28,7 +28,8 @@ jobs: name: "Linux x86_64 (Musl)" target: "x86_64-unknown-linux-musl" args: "--target x86_64-unknown-linux-musl" - use-cross: true + install-musl: true + pkg-config-allow-cross: true - platform: "ubuntu-24.04-arm" name: "Linux arm64" target: "aarch64-unknown-linux-gnu" @@ -67,6 +68,11 @@ jobs: 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 + - name: Install Musl Tools (for musl target) + if: matrix.install-musl == true + run: | + sudo apt-get install -y musl-tools musl-dev + - name: Install pnpm uses: pnpm/action-setup@v4 @@ -85,10 +91,6 @@ 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: @@ -112,9 +114,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} RUSTFLAGS: ${{ matrix.rustflags || '' }} CARGO_BUILD_TARGET: ${{ matrix.target }} + PKG_CONFIG_ALLOW_CROSS: ${{ matrix.pkg-config-allow-cross && '1' || '' }} 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 From 5e0f5ed4c0e9f2d146ec85eee2286ded1bc74063 Mon Sep 17 00:00:00 2001 From: 简律纯 Date: Sat, 14 Feb 2026 20:18:04 +0800 Subject: chore(ci): Disable Musl platform in CI workflow Comment out the Musl platform configuration for CI. --- .github/workflows/semifold-ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '.github') diff --git a/.github/workflows/semifold-ci.yaml b/.github/workflows/semifold-ci.yaml index 9a91518..8aecd90 100644 --- a/.github/workflows/semifold-ci.yaml +++ b/.github/workflows/semifold-ci.yaml @@ -24,12 +24,12 @@ 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" - install-musl: true - pkg-config-allow-cross: true + # - platform: "ubuntu-latest" + # name: "Linux x86_64 (Musl)" + # target: "x86_64-unknown-linux-musl" + # args: "--target x86_64-unknown-linux-musl" + # install-musl: true + # pkg-config-allow-cross: true - platform: "ubuntu-24.04-arm" name: "Linux arm64" target: "aarch64-unknown-linux-gnu" -- cgit v1.2.3-70-g09d2