Merge branch 'master' into lucas/kittest_state

# Conflicts:
#	crates/egui_kittest/src/app_kind.rs
#	crates/egui_kittest/src/builder.rs
#	crates/egui_kittest/src/lib.rs

.gitattributes

@@ -1,3 +1,5 @@
 * text=auto eol=lf
 Cargo.lock linguist-generated=false
-**/tests/snapshots/**/*.png filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+# The icon.png is needed when including eframe via git, so it may not be in lfs
+crates/eframe/data/* !filter !diff !merge text=auto eol=lf

.github/workflows/deploy_web_demo.yml

@@ -39,7 +39,7 @@ jobs:
         with:
           profile: minimal
           target: wasm32-unknown-unknown
-          toolchain: 1.76.0
+          toolchain: 1.77.0
           override: true
 
       - uses: Swatinem/rust-cache@v2

.github/workflows/labels.yml

@@ -29,4 +29,4 @@ jobs:
         with:
           mode: minimum
           count: 1
-          labels: "CI, dependencies, docs and examples, ecolor, eframe, egui_extras, egui_glow, egui-wgpu, egui-winit, egui, epaint, epaint_default_fonts, exclude from changelog, typo"
+          labels: "CI, dependencies, docs and examples, ecolor, eframe, egui_extras, egui_glow, egui_kittest, egui-wgpu, egui-winit, egui, epaint, epaint_default_fonts, exclude from changelog, typo"

.github/workflows/png_only_on_lfs.yml

@@ -0,0 +1,24 @@
+name: All; .png on git LFS
+
+on: [push, pull_request]
+
+jobs:
+  check-binary-files:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Check that png files are on git LFS
+      run: |
+        binary_extensions="png"
+        exclude="crates/eframe/data"
+
+        # Find binary files that are not tracked by Git LFS
+        for ext in $binary_extensions; do
+          if comm -23 <(git ls-files | grep -v "^$exclude" | sort) <(git lfs ls-files -n | sort) | grep "\.${ext}$"; then
+            echo "Error: Found binary file with extension .$ext not tracked by git LFS. See CONTRIBUTING.md"
+            exit 1
+          fi
+        done

.github/workflows/rust.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
 
       - name: Install packages (Linux)
         if: runner.os == 'Linux'
@@ -83,7 +83,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
           targets: wasm32-unknown-unknown
 
       - run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev
@@ -103,7 +103,7 @@ jobs:
       - name: wasm-bindgen
         uses: jetli/[email protected]
         with:
-          version: "0.2.93"
+          version: "0.2.95"
 
       - run: ./scripts/wasm_bindgen_check.sh --skip-setup
 
@@ -155,7 +155,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v1
         with:
-          rust-version: "1.76.0"
+          rust-version: "1.77.0"
           log-level: error
           command: check
           arguments: --target  ${{ matrix.target }}
@@ -170,7 +170,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
           targets: aarch64-linux-android
 
       - name: Set up cargo cache
@@ -189,7 +189,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
           targets: aarch64-apple-ios
 
       - name: Set up cargo cache
@@ -208,7 +208,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
 
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2
@@ -232,7 +232,7 @@ jobs:
           lfs: true
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.76.0
+          toolchain: 1.77.0
 
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2

CONTRIBUTING.md

@@ -35,9 +35,11 @@ You can test your code locally by running `./scripts/check.sh`.
 There are snapshots test that might need to be updated. Run the tests with `UPDATE_SNAPSHOTS=true` to update them.
 For more info about the tests see [egui_kittest](./crates/egui_kittest/README.md).
 
-We use [git-lfs](https://git-lfs.com/) to store big files in the repository. 
+We use [git-lfs](https://git-lfs.com/) to store big files in the repository.
 Make sure you have it installed (running `git lfs ls-files` from the repository root should list some files).
 Don't forget to run `git lfs install` after installing the git-lfs binary.
+You need to add any .png images to `git lfs`.
+If the CI complains about this, make sure you run `git add --renormalize .`.
 
 If you see an `InvalidSignature` error when running snapshot tests, it's probably a problem related to git-lfs.