-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into emilk/update-image
- Loading branch information
Showing
250 changed files
with
6,634 additions
and
3,221 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
* text=auto eol=lf | ||
Cargo.lock linguist-generated=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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' | ||
|
@@ -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 | ||
|
||
|
@@ -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 | ||
|
||
# --------------------------------------------------------------------------- | ||
|
||
|
@@ -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 | ||
|
||
|
@@ -118,11 +108,11 @@ jobs: | |
- name: wasm-bindgen | ||
uses: jetli/[email protected] | ||
with: | ||
version: "0.2.88" | ||
version: "0.2.92" | ||
|
||
- run: ./scripts/wasm_bindgen_check.sh --skip-setup | ||
|
||
- name: Cranky wasm32 | ||
- name: clippy wasm32 | ||
run: ./scripts/clippy_wasm.sh | ||
|
||
# --------------------------------------------------------------------------- | ||
|
@@ -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 }} | ||
|
@@ -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 | ||
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ | |
/.*.json | ||
/.vscode | ||
/media/* | ||
.idea/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.