Skip to content

Commit

Permalink
chore: bump MSRV and use stable in actions
Browse files Browse the repository at this point in the history
Signed-off-by: Lachezar Lechev <[email protected]>
  • Loading branch information
elpiel committed Aug 4, 2023
1 parent 03fd7e4 commit 9e25da1
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 23 deletions.
17 changes: 10 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ jobs:
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
with:
components: clippy, rustfmt
- name: Rust cache
uses: Swatinem/rust-cache@v2
- name: Build code
Expand All @@ -25,3 +22,9 @@ jobs:
run: cargo fmt --all -- --check
- name: Lint code
run: cargo clippy --all -- -D warnings

# MSRV
- name: Check MSRV
uses: dtolnay/[email protected]
- name: Cargo check
run: cargo check
21 changes: 7 additions & 14 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,13 @@ jobs:
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

- uses: dtolnay/rust-toolchain@stable
with:
components: clippy, rustfmt
# Add armv7, aarch64, i686, x86_64 targets
targets: armv7-linux-androideabi, aarch64-linux-android, i686-linux-android, x86_64-linux-android

- name: Rust cache
uses: Swatinem/rust-cache@v2
- name: Build aar
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ authors = ["Smart Code OOD"]
edition = "2021"
resolver = "2"

rust-version = "1.66.1"

[lib]
crate_type = ["staticlib", "dylib"]
path = "src/commonMain/rust/lib.rs"
Expand Down

0 comments on commit 9e25da1

Please sign in to comment.