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

bump msrv 1.64 and tts + bindgen dep #2274

Merged
merged 3 commits into from
Nov 11, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
14 changes: 7 additions & 7 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ env:
jobs:
fmt-crank-check-test:
name: Format + check + test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: 1.62.0
toolchain: 1.64.0
override: true
- name: Install packages (Linux)
if: runner.os == 'Linux'
Expand Down Expand Up @@ -78,13 +78,13 @@ jobs:

check_wasm:
name: Check wasm32 + wasm-bindgen
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.62.0
toolchain: 1.64.0
target: wasm32-unknown-unknown
override: true

Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:

cargo-deny:
name: cargo deny
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: EmbarkStudios/cargo-deny-action@v1
Expand All @@ -140,13 +140,13 @@ jobs:

android:
name: android
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.62.0
toolchain: 1.64.0
target: aarch64-linux-android
override: true
- name: Set up cargo cache
Expand Down
150 changes: 91 additions & 59 deletions Cargo.lock

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

4 changes: 4 additions & 0 deletions Cranky.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,4 +108,8 @@ warn = [
]

allow = [
"clippy::derive_partial_eq_without_eq",
"clippy::type_complexity",
"clippy::unnecessary_lazy_evaluations",
"clippy::let-and-return"
]
2 changes: 1 addition & 1 deletion crates/eframe/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -145,5 +145,5 @@ web-sys = { version = "0.3.58", features = [

# optional web:
egui-wgpu = { version = "0.19.0", path = "../egui-wgpu", optional = true } # if wgpu is used, use it without (!) winit
tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux
tts = { version = "0.24", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux
coderedart marked this conversation as resolved.
Show resolved Hide resolved
wgpu = { version = "0.14", optional = true, features = ["webgl"] }
2 changes: 1 addition & 1 deletion crates/egui-winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ puffin = { version = "0.14", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }

# feature screen_reader
tts = { version = "0.20", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux
tts = { version = "0.24", optional = true } # Can't use 0.21-0.24 due to compilation problems on linux
coderedart marked this conversation as resolved.
Show resolved Hide resolved

webbrowser = { version = "0.8", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'".

[toolchain]
channel = "1.62.0"
channel = "1.64.0"
components = [ "rustfmt", "clippy" ]
targets = [ "wasm32-unknown-unknown" ]