From 72f5dd75fe21b1beeef82c9bdefe130db9715e4d Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:02:56 +0800 Subject: [PATCH 01/11] build: Update build --- .github/{build.sh => musl_build.sh} | 16 +++------ .github/workflows/ci.yml | 56 +++++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 19 deletions(-) rename .github/{build.sh => musl_build.sh} (52%) diff --git a/.github/build.sh b/.github/musl_build.sh similarity index 52% rename from .github/build.sh rename to .github/musl_build.sh index a3766a18..f6b75da6 100644 --- a/.github/build.sh +++ b/.github/musl_build.sh @@ -8,19 +8,15 @@ fi TARGET=$1 MANYLINUX=$2 -BASH_IMAGE="ghcr.io/0x676e67/rust-musl-cross" +IMAGE="ghcr.io/0x676e67/rust-musl-cross" VOLUME_MAPPING="-v $(pwd):/home/rust/src" MATURIN_CMD="maturin build --release --out dist --find-interpreter" case $TARGET in x86_64-unknown-linux-musl | \ - x86_64-unknown-linux-gnu | \ aarch64-unknown-linux-musl | \ - aarch64-unknown-linux-gnu | \ armv7-unknown-linux-musleabihf | \ - armv7-unknown-linux-gnueabihf | \ - i686-unknown-linux-musl | \ - i686-unknown-linux-gnu) + i686-unknown-linux-musl) ;; *) echo "Unknown target: $TARGET" @@ -28,12 +24,8 @@ case $TARGET in ;; esac -if [ "$MANYLINUX" == "manylinux" ]; then - echo "Building for manylinux..." - MATURIN_CMD="maturin build --release --target $TARGET --out dist --manylinux" -fi - echo "Building for $TARGET..." -docker run --rm $VOLUME_MAPPING $BASH_IMAGE:$TARGET /bin/bash -c "$MATURIN_CMD" +docker pull $IMAGE:$TARGET +docker run --rm $VOLUME_MAPPING $IMAGE:$TARGET /bin/bash -c "$MATURIN_CMD" echo "Build completed for target: $TARGET" \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ff505c8a..1f77773c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,19 +65,61 @@ jobs: strategy: matrix: platform: - - runner: ubuntu-22.04 + - runner:: ubuntu-22.04 target: x86_64-unknown-linux-gnu - - runner: ubuntu-22.04 + - runner:: ubuntu-22.04 target: aarch64-unknown-linux-gnu - - runner: ubuntu-22.04 + apt_packages: crossbuild-essential-arm64 + custom_env: + CFLAGS_aarch64_unknown_linux_gnu: -D__ARM_ARCH=8 + CC: aarch64-linux-gnu-gcc + CXX: aarch64-linux-gnu-g++ + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-g++ + RUSTC_LINKER: aarch64-linux-gnu-g++ + - runner:: ubuntu-22.04 target: armv7-unknown-linux-gnueabihf - - runner: ubuntu-22.04 + apt_packages: crossbuild-essential-armhf + custom_env: + CC: arm-linux-gnueabihf-gcc + CXX: arm-linux-gnueabihf-g++ + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ + RUSTC_LINKER: arm-linux-gnueabihf-g++ + - runner:: ubuntu-22.04 target: i686-unknown-linux-gnu + apt_packages: gcc-multilib + custom_env: + CC: i686-linux-gnu-gcc + CXX: i686-linux-gnu-g++ + CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ + RUSTC_LINKER: i686-linux-gnu-g++ steps: - uses: actions/checkout@v4 + - name: Install base dependencies on Ubuntu + run: | + sudo apt-get update + sudo apt-get install -y build-essential cmake perl pkg-config libclang-dev musl-tools + + - name: Install target-specific APT dependencies + if: ${{ matrix.platform.apt_packages != '' }} + run: | + sudo apt-get update + sudo apt-get install -y ${{ matrix.platform.apt_packages }} + + - name: Add Rust target + run: rustup target add ${{ matrix..platform.target }} + + - uses: actions/setup-python@v5 + with: + python-version: 3.x + architecture: ${{ matrix.platform.target }} + - name: Build wheels - run: - bash .github/build.sh ${{ matrix.platform.target }} manylinux + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.platform.target }} + args: --release --out dist --find-interpreter + sccache: 'true' + - name: Upload wheels uses: actions/upload-artifact@v4 with: @@ -102,7 +144,7 @@ jobs: - uses: actions/checkout@v4 - name: Build wheels run: - bash .github/build.sh ${{ matrix.platform.target }} + bash .github/musl_build.sh ${{ matrix.platform.target }} - name: Upload wheels uses: actions/upload-artifact@v4 with: From bb999dd6f21afb65f891a44ea472ef0f63ab714c Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:04:07 +0800 Subject: [PATCH 02/11] build: Update build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f77773c..0220dc7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -106,7 +106,7 @@ jobs: sudo apt-get install -y ${{ matrix.platform.apt_packages }} - name: Add Rust target - run: rustup target add ${{ matrix..platform.target }} + run: rustup target add ${{ matrix.platform.target }} - uses: actions/setup-python@v5 with: From 274d46007d9cc4a1c529d0d6c97a0231f9355d69 Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:14:48 +0800 Subject: [PATCH 03/11] build: Update build --- .github/workflows/ci.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0220dc7e..b39fc7ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,16 +59,16 @@ jobs: source .venv/bin/activate pytest - linux: + manylinux: runs-on: ${{ matrix.platform.runner }} environment: ManyLinux strategy: matrix: platform: - runner:: ubuntu-22.04 - target: x86_64-unknown-linux-gnu + target: x86_64 - runner:: ubuntu-22.04 - target: aarch64-unknown-linux-gnu + target: aarch64 apt_packages: crossbuild-essential-arm64 custom_env: CFLAGS_aarch64_unknown_linux_gnu: -D__ARM_ARCH=8 @@ -77,7 +77,7 @@ jobs: CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-g++ RUSTC_LINKER: aarch64-linux-gnu-g++ - runner:: ubuntu-22.04 - target: armv7-unknown-linux-gnueabihf + target: armv7 apt_packages: crossbuild-essential-armhf custom_env: CC: arm-linux-gnueabihf-gcc @@ -85,7 +85,7 @@ jobs: CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ RUSTC_LINKER: arm-linux-gnueabihf-g++ - runner:: ubuntu-22.04 - target: i686-unknown-linux-gnu + target: i686 apt_packages: gcc-multilib custom_env: CC: i686-linux-gnu-gcc @@ -94,10 +94,6 @@ jobs: RUSTC_LINKER: i686-linux-gnu-g++ steps: - uses: actions/checkout@v4 - - name: Install base dependencies on Ubuntu - run: | - sudo apt-get update - sudo apt-get install -y build-essential cmake perl pkg-config libclang-dev musl-tools - name: Install target-specific APT dependencies if: ${{ matrix.platform.apt_packages != '' }} @@ -105,9 +101,6 @@ jobs: sudo apt-get update sudo apt-get install -y ${{ matrix.platform.apt_packages }} - - name: Add Rust target - run: rustup target add ${{ matrix.platform.target }} - - uses: actions/setup-python@v5 with: python-version: 3.x @@ -118,7 +111,7 @@ jobs: with: target: ${{ matrix.platform.target }} args: --release --out dist --find-interpreter - sccache: 'true' + sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - name: Upload wheels uses: actions/upload-artifact@v4 @@ -233,7 +226,7 @@ jobs: name: Release runs-on: ubuntu-latest if: ${{ startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch' }} - needs: [linux,musllinux, windows, macos, sdist, tests, style] + needs: [manylinux, musllinux, windows, macos, sdist, tests, style] permissions: # Use to sign the release artifacts id-token: write From c3309d83d4d3096a94cd37c72bc37628e877e94c Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:17:55 +0800 Subject: [PATCH 04/11] build: Update build --- .github/workflows/ci.yml | 45 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b39fc7ef..e04575c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,13 +61,22 @@ jobs: manylinux: runs-on: ${{ matrix.platform.runner }} - environment: ManyLinux strategy: matrix: platform: - - runner:: ubuntu-22.04 + - runner: ubuntu-22.04 target: x86_64 - - runner:: ubuntu-22.04 + apt_packages: "" + custom_env: {} + - runner: ubuntu-22.04 + target: x86 + apt_packages: crossbuild-essential-i386 + custom_env: + CC: i686-linux-gnu-gcc + CXX: i686-linux-gnu-g++ + CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ + RUSTC_LINKER: i686-linux-gnu-g++ + - runner: ubuntu-22.04 target: aarch64 apt_packages: crossbuild-essential-arm64 custom_env: @@ -76,7 +85,7 @@ jobs: CXX: aarch64-linux-gnu-g++ CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-g++ RUSTC_LINKER: aarch64-linux-gnu-g++ - - runner:: ubuntu-22.04 + - runner: ubuntu-22.04 target: armv7 apt_packages: crossbuild-essential-armhf custom_env: @@ -84,35 +93,25 @@ jobs: CXX: arm-linux-gnueabihf-g++ CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ RUSTC_LINKER: arm-linux-gnueabihf-g++ - - runner:: ubuntu-22.04 - target: i686 - apt_packages: gcc-multilib - custom_env: - CC: i686-linux-gnu-gcc - CXX: i686-linux-gnu-g++ - CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ - RUSTC_LINKER: i686-linux-gnu-g++ steps: - uses: actions/checkout@v4 - - - name: Install target-specific APT dependencies - if: ${{ matrix.platform.apt_packages != '' }} - run: | - sudo apt-get update - sudo apt-get install -y ${{ matrix.platform.apt_packages }} - - uses: actions/setup-python@v5 with: python-version: 3.x - architecture: ${{ matrix.platform.target }} - - name: Build wheels uses: PyO3/maturin-action@v1 with: target: ${{ matrix.platform.target }} - args: --release --out dist --find-interpreter + args: --release --out dist sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - + manylinux: auto + - name: Build free-threaded wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.platform.target }} + args: --release --out dist -i python3.13t + sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} + manylinux: auto - name: Upload wheels uses: actions/upload-artifact@v4 with: From eee79c55f0da1a886227dad74aed0990b0a95016 Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:23:41 +0800 Subject: [PATCH 05/11] build: Update build --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e04575c8..83a62c06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,11 +67,11 @@ jobs: - runner: ubuntu-22.04 target: x86_64 apt_packages: "" - custom_env: {} + env: {} - runner: ubuntu-22.04 target: x86 apt_packages: crossbuild-essential-i386 - custom_env: + env: CC: i686-linux-gnu-gcc CXX: i686-linux-gnu-g++ CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ @@ -79,7 +79,7 @@ jobs: - runner: ubuntu-22.04 target: aarch64 apt_packages: crossbuild-essential-arm64 - custom_env: + env: CFLAGS_aarch64_unknown_linux_gnu: -D__ARM_ARCH=8 CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ @@ -88,7 +88,7 @@ jobs: - runner: ubuntu-22.04 target: armv7 apt_packages: crossbuild-essential-armhf - custom_env: + env: CC: arm-linux-gnueabihf-gcc CXX: arm-linux-gnueabihf-g++ CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ @@ -112,6 +112,7 @@ jobs: args: --release --out dist -i python3.13t sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: auto + env: ${{ matrix.platform.env }} - name: Upload wheels uses: actions/upload-artifact@v4 with: From 46cb9164a8494bdd5feaed643d700e9691a6bfe1 Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:25:08 +0800 Subject: [PATCH 06/11] build: Update build --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83a62c06..a5c3fb29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,13 +105,6 @@ jobs: args: --release --out dist sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: auto - - name: Build free-threaded wheels - uses: PyO3/maturin-action@v1 - with: - target: ${{ matrix.platform.target }} - args: --release --out dist -i python3.13t - sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} - manylinux: auto env: ${{ matrix.platform.env }} - name: Upload wheels uses: actions/upload-artifact@v4 From 4e0fda4d5ce763bb81edee84d657469445b16234 Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:26:09 +0800 Subject: [PATCH 07/11] build: Update build --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5c3fb29..3ab72c35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,11 +67,11 @@ jobs: - runner: ubuntu-22.04 target: x86_64 apt_packages: "" - env: {} + cenv: {} - runner: ubuntu-22.04 target: x86 apt_packages: crossbuild-essential-i386 - env: + cenv: CC: i686-linux-gnu-gcc CXX: i686-linux-gnu-g++ CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ @@ -79,7 +79,7 @@ jobs: - runner: ubuntu-22.04 target: aarch64 apt_packages: crossbuild-essential-arm64 - env: + cenv: CFLAGS_aarch64_unknown_linux_gnu: -D__ARM_ARCH=8 CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ @@ -88,7 +88,7 @@ jobs: - runner: ubuntu-22.04 target: armv7 apt_packages: crossbuild-essential-armhf - env: + cenv: CC: arm-linux-gnueabihf-gcc CXX: arm-linux-gnueabihf-g++ CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ @@ -105,7 +105,8 @@ jobs: args: --release --out dist sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: auto - env: ${{ matrix.platform.env }} + container: 'off' + env: ${{ matrix.platform.cenv }} - name: Upload wheels uses: actions/upload-artifact@v4 with: From 81e8125953591ed5bbfd6c32743857ff69a2e32e Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:27:34 +0800 Subject: [PATCH 08/11] build: Update build --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3ab72c35..a6151fc7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,11 +67,11 @@ jobs: - runner: ubuntu-22.04 target: x86_64 apt_packages: "" - cenv: {} + custom_env: {} - runner: ubuntu-22.04 target: x86 apt_packages: crossbuild-essential-i386 - cenv: + custom_env: CC: i686-linux-gnu-gcc CXX: i686-linux-gnu-g++ CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ @@ -79,7 +79,7 @@ jobs: - runner: ubuntu-22.04 target: aarch64 apt_packages: crossbuild-essential-arm64 - cenv: + custom_env: CFLAGS_aarch64_unknown_linux_gnu: -D__ARM_ARCH=8 CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ @@ -88,7 +88,7 @@ jobs: - runner: ubuntu-22.04 target: armv7 apt_packages: crossbuild-essential-armhf - cenv: + custom_env: CC: arm-linux-gnueabihf-gcc CXX: arm-linux-gnueabihf-g++ CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ @@ -106,7 +106,7 @@ jobs: sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} manylinux: auto container: 'off' - env: ${{ matrix.platform.cenv }} + env: ${{ matrix.platform.custom_env }} - name: Upload wheels uses: actions/upload-artifact@v4 with: From e6eb8cea20bbd5985714b0d00fd34d5c869af5f2 Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:28:27 +0800 Subject: [PATCH 09/11] build: Update build --- .github/workflows/ci.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6151fc7..900026ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,21 +62,14 @@ jobs: manylinux: runs-on: ${{ matrix.platform.runner }} strategy: + fail-fast: false matrix: platform: - - runner: ubuntu-22.04 + - runner: ubuntu-latest target: x86_64 - apt_packages: "" + apt_packages: '' custom_env: {} - - runner: ubuntu-22.04 - target: x86 - apt_packages: crossbuild-essential-i386 - custom_env: - CC: i686-linux-gnu-gcc - CXX: i686-linux-gnu-g++ - CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ - RUSTC_LINKER: i686-linux-gnu-g++ - - runner: ubuntu-22.04 + - runner: ubuntu-latest target: aarch64 apt_packages: crossbuild-essential-arm64 custom_env: @@ -84,29 +77,31 @@ jobs: CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-g++ - RUSTC_LINKER: aarch64-linux-gnu-g++ - - runner: ubuntu-22.04 + - runner: ubuntu-latest target: armv7 apt_packages: crossbuild-essential-armhf custom_env: CC: arm-linux-gnueabihf-gcc CXX: arm-linux-gnueabihf-g++ CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-g++ - RUSTC_LINKER: arm-linux-gnueabihf-g++ steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: python-version: 3.x + - name: Install target-specific APT dependencies + if: "matrix.platform.apt_packages != ''" + run: sudo apt-get update && sudo apt-get install -y ${{ matrix.platform.apt_packages }} - name: Build wheels uses: PyO3/maturin-action@v1 with: + rust-toolchain: stable target: ${{ matrix.platform.target }} - args: --release --out dist - sccache: ${{ !startsWith(github.ref, 'refs/tags/') }} + args: ${{ matrix.platform.target == 'x86_64' && '--release --out dist --zig' || '--release --out dist' }} + sccache: 'false' manylinux: auto container: 'off' - env: ${{ matrix.platform.custom_env }} + env: ${{ matrix.platform.custom_env }} - name: Upload wheels uses: actions/upload-artifact@v4 with: From 71271decaf4b7f35c3e61ab69d4e929b888d6708 Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:29:20 +0800 Subject: [PATCH 10/11] build: Update build --- .github/workflows/ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 900026ad..4b030926 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,11 +65,18 @@ jobs: fail-fast: false matrix: platform: - - runner: ubuntu-latest + - runner: ubuntu-20.04 target: x86_64 apt_packages: '' custom_env: {} - - runner: ubuntu-latest + - runner: ubuntu-20.04 + target: x86 + apt_packages: crossbuild-essential-i386 + custom_env: + CC: i686-linux-gnu-gcc + CXX: i686-linux-gnu-g++ + CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ + - runner: ubuntu-20.04 target: aarch64 apt_packages: crossbuild-essential-arm64 custom_env: @@ -77,7 +84,7 @@ jobs: CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-g++ - - runner: ubuntu-latest + - runner: ubuntu-20.04 target: armv7 apt_packages: crossbuild-essential-armhf custom_env: From c0a9cfbfacc546078075c8d8faffca8a51b77f3e Mon Sep 17 00:00:00 2001 From: 0x676e67 Date: Sun, 16 Feb 2025 14:35:29 +0800 Subject: [PATCH 11/11] build: Update build --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b030926..a7e02da0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,18 +65,18 @@ jobs: fail-fast: false matrix: platform: - - runner: ubuntu-20.04 + - runner: ubuntu-22.04 target: x86_64 apt_packages: '' custom_env: {} - - runner: ubuntu-20.04 + - runner: ubuntu-22.04 target: x86 apt_packages: crossbuild-essential-i386 custom_env: CC: i686-linux-gnu-gcc CXX: i686-linux-gnu-g++ CARGO_TARGET_I686_UNKNOWN_LINUX_GNU_LINKER: i686-linux-gnu-g++ - - runner: ubuntu-20.04 + - runner: ubuntu-22.04 target: aarch64 apt_packages: crossbuild-essential-arm64 custom_env: @@ -84,7 +84,7 @@ jobs: CC: aarch64-linux-gnu-gcc CXX: aarch64-linux-gnu-g++ CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-g++ - - runner: ubuntu-20.04 + - runner: ubuntu-22.04 target: armv7 apt_packages: crossbuild-essential-armhf custom_env: