Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update deps and change edition to 2021 #36

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,32 @@ name: Build
on:
push:
branches:
- '**'
- "**"

# Stops the running workflow of previous pushes
concurrency:
group: ${{ github.ref }}
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Set default rust toolchain
run: rustup default 1.61.0
- name: Install rustfmt
run: rustup component add rustfmt
- name: Install clippy
run: rustup component add clippy
uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
sleeyax marked this conversation as resolved.
Show resolved Hide resolved
with:
components: clippy, rustfmt
- name: Rust cache
uses: Swatinem/rust-cache@v2
- name: Build code
run: cargo build
- name: Lint code format
run: cargo fmt --all -- --check
run: cargo fmt --all --check
- name: Lint code
run: cargo clippy --all -- -D warnings
run: cargo clippy --no-deps -- -D warnings

# MSRV
- uses: dtolnay/[email protected]
- name: Cargo check MSRV
run: cargo check
23 changes: 8 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,14 @@ jobs:
- name: Setup Android SDK
uses: android-actions/setup-android@v2
- name: Setup Android NDK
run: yes | sdkmanager "ndk;21.0.6113669" >/dev/null
- name: Set default rust toolchain
run: rustup default 1.61.0
- name: Install rustfmt
run: rustup component add rustfmt
- name: Install clippy
run: rustup component add clippy
- name: Add armv7 target
run: rustup target add armv7-linux-androideabi
- name: Add aarch64 target
run: rustup target add aarch64-linux-android
- name: Add i686 target
run: rustup target add i686-linux-android
- name: Add x86_64 target
run: rustup target add x86_64-linux-android
run: yes | sdkmanager "ndk;25.2.9519653"" >/dev/null

- uses: dtolnay/rust-toolchain@stable
with:
components: clippy, rustfmt
elpiel marked this conversation as resolved.
Show resolved Hide resolved
# Add armv7, aarch64, i686, x86_64 targets
targets: armv7-linux-androideabi, aarch64-linux-android, i686-linux-android, x86_64-linux-android
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be tested on the next release.

  • We should also consider running cargo check with the given targets to make sure we don't find issues when we want to release a new version


- name: Rust cache
uses: Swatinem/rust-cache@v2
- name: Build aar
Expand Down
Loading