Skip to content

Commit

Permalink
Merge branch 'emilk:master' into patch3
Browse files Browse the repository at this point in the history
  • Loading branch information
rustbasic authored Apr 29, 2024
2 parents 24a1e93 + af39bd2 commit e38f7ea
Show file tree
Hide file tree
Showing 107 changed files with 514 additions and 420 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please read the "Making a PR" section of [`CONTRIBUTING.md`](https://github.com/
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to `egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for maintainers to add commits to your PR.
* Remember to run `cargo fmt` and `cargo cranky`.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run `./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_web_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
profile: minimal
target: wasm32-unknown-unknown
toolchain: 1.72.0
toolchain: 1.76.0
override: true

- uses: Swatinem/rust-cache@v2
Expand Down
30 changes: 10 additions & 20 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.72.0
toolchain: 1.76.0

- name: Install packages (Linux)
if: runner.os == 'Linux'
Expand All @@ -40,11 +40,6 @@ jobs:
- name: Lint vertical spacing
run: ./scripts/lint.py

- name: Install cargo-cranky
uses: baptiste0928/cargo-install@v1
with:
crate: cargo-cranky

- name: check --all-features
run: cargo check --locked --all-features --all-targets

Expand Down Expand Up @@ -78,11 +73,11 @@ jobs:
- name: Test
run: cargo test --all-features

- name: Cranky
run: cargo cranky --all-targets --all-features -- -D warnings
- name: clippy
run: cargo clippy --all-targets --all-features -- -D warnings

- name: Cranky release
run: cargo cranky --all-targets --all-features --release -- -D warnings
- name: clippy release
run: cargo clippy --all-targets --all-features --release -- -D warnings

# ---------------------------------------------------------------------------

Expand All @@ -93,19 +88,14 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.72.0
toolchain: 1.76.0
targets: wasm32-unknown-unknown

- run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2

- name: Install cargo-cranky
uses: baptiste0928/cargo-install@v1
with:
crate: cargo-cranky

- name: Check wasm32 egui_demo_app
run: cargo check -p egui_demo_app --lib --target wasm32-unknown-unknown

Expand All @@ -122,7 +112,7 @@ jobs:

- run: ./scripts/wasm_bindgen_check.sh --skip-setup

- name: Cranky wasm32
- name: clippy wasm32
run: ./scripts/clippy_wasm.sh

# ---------------------------------------------------------------------------
Expand Down Expand Up @@ -151,7 +141,7 @@ jobs:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
with:
rust-version: "1.72.0"
rust-version: "1.76.0"
log-level: error
command: check
arguments: --target ${{ matrix.target }}
Expand All @@ -166,7 +156,7 @@ jobs:

- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.72.0
toolchain: 1.76.0
targets: aarch64-linux-android

- name: Set up cargo cache
Expand All @@ -184,7 +174,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.72.0
toolchain: 1.76.0

- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// Tell Rust Analyzer to use its own target directory, so we don't need to wait for it to finish wen we want to `cargo run`
"rust-analyzer.check.overrideCommand": [
"cargo",
"cranky",
"clippy",
"--target-dir=target_ra",
"--workspace",
"--message-format=json",
Expand All @@ -24,7 +24,7 @@
],
"rust-analyzer.cargo.buildScripts.overrideCommand": [
"cargo",
"cranky",
"clippy",
"--quiet",
"--target-dir=target_ra",
"--workspace",
Expand Down
101 changes: 65 additions & 36 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 e38f7ea

Please sign in to comment.