dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build/windows: fix submodule checkout failure 

Bruno note: This commit was repurposed after ad132ad0.

---

For some reason, on the Windows/Aarch64 runners only, submodule updates fails
with:

> + git submodule update --init
> From https://gitlab.gnome.org/GNOME/gimp-data
>  * branch            d1041a4d97871c85538938872d0ace69d2fc44c2 -> FETCH_HEAD
> error: Your local changes to the following files would be overwritten by checkout:
>         images/README.md
>         images/logo/meson.build
>         images/meson.build

The big question was: why are there edits to begin with? This is supposed to be
a brand new clone!
After a bit of investigation, it turns out that the whole files have incorrect
EOL endings (a `git diff` returns every possible lines in the whole
repositories, but `git diff --ignore-cr-at-eol` returns nothing). It looks like
this breaks the submodule update.
This commit is contained in:
Jehan 2024-04-06 14:38:22 +02:00 committed by Bruno Lopes
parent 194eaf1312
commit a9c8420368
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/windows/gitlab-ci/2_build-gimp-msys2.sh
View File

@ -29,7 +29,7 @@ else
echo "To run this script locally, please do it from to the gimp git folder"
exit 1
fi
git submodule update --init
git submodule update --init --force
pacman --noconfirm -Suy
export MESON_OPTIONS="-Drelocatable-bundle=no"
fi