From daaead1dc39a5ac1bbbd3c4257ecd613746640a0 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 22 Nov 2022 14:36:15 -0600 Subject: [PATCH 1/3] Tweak features used in CI builds. --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 75eb60f..bc664df 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,8 +17,8 @@ jobs: if: ${{ runner.os == 'Linux' }} - run: | rustup toolchain install stable - cargo fmt --all --check - cargo clippy --all-features + cargo fmt --check + cargo clippy check_web: name: Check Web @@ -29,7 +29,7 @@ jobs: rustup toolchain install stable rustup target add wasm32-unknown-unknown cargo fmt --all --check - cargo clippy --all-features --target wasm32-unknown-unknown + cargo clippy --target wasm32-unknown-unknown check_android: name: Check Android From c339d2bee3bb07e61186cd835c81ef7bc2a55130 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 22 Nov 2022 14:55:31 -0600 Subject: [PATCH 2/3] Bump editions in exampels, and remove unnecessary dependencies. --- examples/android/cargo.toml | 2 +- examples/web/Cargo.toml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/android/cargo.toml b/examples/android/cargo.toml index c0b85bc..1e22492 100644 --- a/examples/android/cargo.toml +++ b/examples/android/cargo.toml @@ -2,7 +2,7 @@ name = "hello_world" version = "0.1.0" authors = ["Nolan Darilek "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/examples/web/Cargo.toml b/examples/web/Cargo.toml index e3cb923..14569a3 100644 --- a/examples/web/Cargo.toml +++ b/examples/web/Cargo.toml @@ -2,7 +2,7 @@ name = "web" version = "0.1.0" authors = ["Nolan Darilek "] -edition = "2018" +edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -11,4 +11,3 @@ console_log = "0.2" log = "0.4" seed = "0.9" tts = { path = "../.." } -wasm-bindgen = "0.2" \ No newline at end of file From d65d79f8fb5e1027a59d451aa8e3f0b8d6544bd1 Mon Sep 17 00:00:00 2001 From: Nolan Darilek Date: Tue, 22 Nov 2022 15:16:18 -0600 Subject: [PATCH 3/3] More tweaks and simplifications to work around ndk-sys checksum failure. --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc664df..0b9fc9d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,8 +26,8 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - rustup toolchain install stable rustup target add wasm32-unknown-unknown + rustup toolchain install stable cargo fmt --all --check cargo clippy --target wasm32-unknown-unknown @@ -48,7 +48,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: | - rustup toolchain install stable rustup target add wasm32-unknown-unknown - cargo install cargo-make - cargo make build-web-example + rustup toolchain install stable + cd examples/web + cargo build --target wasm32-unknown-unknown