diff --git a/.gitattributes b/.gitattributes index 2fe00c00..09b004b6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,5 @@ * text=auto eol=lf Cargo.lock linguist-generated=false *.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 diff --git a/.github/workflows/png_only_on_lfs.yml b/.github/workflows/png_only_on_lfs.yml index a179f545..e3d68ea3 100644 --- a/.github/workflows/png_only_on_lfs.yml +++ b/.github/workflows/png_only_on_lfs.yml @@ -13,10 +13,11 @@ jobs: - 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 | sort) <(git lfs ls-files -n | sort) | grep "\.${ext}$"; then + 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 diff --git a/crates/eframe/data/icon.png b/crates/eframe/data/icon.png index 91a0f077..cf1e6c3e 100644 Binary files a/crates/eframe/data/icon.png and b/crates/eframe/data/icon.png differ