Skip to content

Commit

Permalink
Merge #1352
Browse files Browse the repository at this point in the history
1352: Run `uniffi-bindgen` command instead of depending on `uniffi_bindgen` crates r=messense a=messense

`uniffi_bindgen` crate is too heavy weight and people uses `uniffi` usually have already installed uniffi-bindgen.

Part of #1337, reduces `--no-default-features` compile time on M2 MacBook Air from 26.2s to 22.3s.

Co-authored-by: messense <[email protected]>
  • Loading branch information
bors[bot] and messense authored Dec 13, 2022
2 parents e7b8c22 + a5ea984 commit ee02e5b
Show file tree
Hide file tree
Showing 10 changed files with 103 additions and 245 deletions.
3 changes: 3 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ macos_arm64_task:
- cat Cargo.lock
install_script:
- brew install python3
- python3 -m pip install uniffi-bindgen
<<: *BUILD_AND_TEST

linux_aarch64_task:
Expand All @@ -73,4 +74,6 @@ linux_aarch64_task:
fingerprint_script:
- echo $CIRRUS_OS
- cat Cargo.lock
install_script:
- python3 -m pip install uniffi-bindgen
<<: *BUILD_AND_TEST
12 changes: 8 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ jobs:
env:
RUST_BACKTRACE: '1'
steps:
- name: Cleanup Disk
if: ${{ !startsWith(matrix.os, 'windows') }}
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
- uses: actions/checkout@v3
- uses: conda-incubator/setup-miniconda@v2
with:
Expand All @@ -132,7 +137,7 @@ jobs:
if: ${{ !contains(matrix.python-version, 'pypy') }}
run: pip install cffi
- name: Install python packages
run: pip install virtualenv ziglang~=0.10.0 twine
run: pip install virtualenv ziglang~=0.10.0 twine uniffi-bindgen
- uses: dtolnay/rust-toolchain@stable
id: rustup
with:
Expand Down Expand Up @@ -170,10 +175,9 @@ jobs:
if: contains(matrix.python-version, 'pypy')
run: echo "MATURIN_TEST_PYTHON=pypy3" >> $GITHUB_ENV
- name: cargo test
env:
RUSTFLAGS: "-C debuginfo=0" # save disk space
run: cargo nextest run --features password-storage
- name: free up disk space
shell: bash
run: rm -rf test-crates/venvs test-crates/targets
- name: test cross compiling with zig
shell: bash
run: |
Expand Down
190 changes: 14 additions & 176 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ee02e5b

Please sign in to comment.