diff options
| author |   简律纯 <i@jyunko.cn> | 2026-02-10 13:27:28 +0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2026-02-10 13:27:28 +0800 |
| commit | ea138c10eddbdf110f4ac5566f0b66b5216ee906 (patch) | |
| tree | d3ffcbd1a53b4567c1ba5995a49ecf656fb3c596 /.github | |
| parent | e6517602847950fd2fe7c14fffa92f4765336a4c (diff) | |
| parent | 3bc1e77f3922d5bdb824d1249971738a8d175f41 (diff) | |
| download | DropOut-ea138c10eddbdf110f4ac5566f0b66b5216ee906.tar.gz DropOut-ea138c10eddbdf110f4ac5566f0b66b5216ee906.zip | |
Merge branch 'dev' into main
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/semifold-ci.yaml | 14 |
1 files changed, 8 insertions, 6 deletions
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') |