Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main into docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Fluvio Authors committed Aug 21, 2024
2 parents eb09047 + ddf53cc commit feafd1e
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 10 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,61 @@ on:
branches: [main]

jobs:
ci_build_cc_wheels:
name: Cross Build wheels for ${{ matrix.platform.name }}
runs-on: ubuntu-latest
env:
CARGO: cross
strategy:
matrix:
platform:
[
{ name: "linux_armv7l", target: "armv7-unknown-linux-gnueabihf" },
{ name: "linux_armv6l", target: "arm-unknown-linux-gnueabihf" },
{
name: "manylinux2014_aarch64",
target: "aarch64-unknown-linux-gnu",
},
]
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: |
~/.cargo/bin/
~/.cargo/registry/index/
~/.cargo/registry/cache/
~/.cargo/git/db/
~/.cargo/.crates.toml
~/.cargo/.crates2.json
target/
key: ${{ matrix.platform.target }}-cargo-${{ matrix.platform.name }}-${{ hashFiles('**/Cargo.lock') }}
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: "3.12"
- name: Install Rust ${{ matrix.platform.target }}
uses: dtolnay/rust-toolchain@master
with:
target: ${{ matrix.platform.target }}
toolchain: stable

- name: Install cross
uses: taiki-e/install-action@v2
with:
tool: cross

- name: Install setuptools and setuptools-rust
run: |
python -m pip install --upgrade wheel setuptools setuptools-rust
- name: Build cross image
run: |
docker build -f cross/Dockerfile.${{ matrix.platform.target }} -t fluvio-cross-python:${{ matrix.platform.target }} cross
- name: Build bdist
run: |
python setup.py bdist_wheel --py-limited-api=cp38 --plat-name ${{ matrix.platform.name }}
env:
CARGO_BUILD_TARGET: ${{ matrix.platform.target }}
check_fmt:
name: check formatting
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: "3.11"
python-version: "3.12"
- name: Install Rust ${{ matrix.platform.target }}
uses: dtolnay/rust-toolchain@master
with:
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ anyhow = "1.0"
async-h1 = "2.3.3"
async-lock = "3.3.0"
async-std = "1.6.5"
aws-lc-rs = { version = "1", features = ["bindgen"] }
cc = "=1.1.12"
dirs = "5.0.1"
futures = "0.3.30"
Expand Down
4 changes: 1 addition & 3 deletions cross/Dockerfile.aarch64-unknown-linux-gnu
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
FROM rustembedded/cross:aarch64-unknown-linux-gnu

RUN apt-get update && apt-get install python3 -y && rm -rf /var/lib/apt/lists/*
FROM ghcr.io/cross-rs/aarch64-unknown-linux-gnu:main
4 changes: 1 addition & 3 deletions cross/Dockerfile.arm-unknown-linux-gnueabihf
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
FROM rustembedded/cross:arm-unknown-linux-gnueabihf

RUN apt-get update && apt-get install python3 -y && rm -rf /var/lib/apt/lists/*
FROM ghcr.io/cross-rs/arm-unknown-linux-gnueabihf:main
4 changes: 1 addition & 3 deletions cross/Dockerfile.armv7-unknown-linux-gnueabihf
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
FROM rustembedded/cross:armv7-unknown-linux-gnueabihf

RUN apt-get update && apt-get install python3 -y && rm -rf /var/lib/apt/lists/*
FROM ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:main

0 comments on commit feafd1e

Please sign in to comment.