From 1a7f673b7d9195f131a3bc7a3ec5aa3def9a6393 Mon Sep 17 00:00:00 2001
From: Bruno Lopes <brunvonlope@outlook.com>
Date: Mon, 22 Sep 2025 10:40:54 -0300
Subject: [PATCH] gitlab: Check gimp-data submodule too on meson-health job

---
 .gitlab-ci.yml                   | 2 ++
 .gitlab/run_meson_health_diff.sh | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 645e84bf9c..ae1b6f3e71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -672,6 +672,8 @@ meson-health:
     - <<: *CI_MERGE
     - <<: *CI_COMMIT
   stage: analysis
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   script:
     - apt-get update -qq
     - apt-get install -qq -y --no-install-recommends git shellcheck devscripts
diff --git a/.gitlab/run_meson_health_diff.sh b/.gitlab/run_meson_health_diff.sh
index 6b587ac55a..64abc31b8e 100644
--- a/.gitlab/run_meson_health_diff.sh
+++ b/.gitlab/run_meson_health_diff.sh
@@ -5,7 +5,7 @@
 
 # CHECK SCRIPTS RUNNED BY MESON (ALL OSes)
 printf "\e[0Ksection_start:`date +%s`:nonunix_test[collapsed=false]\r\e[0KChecking for non-Unix compatibility\n"
-diff=$(git diff -U0 --no-color "${newest_common_ancestor_sha}" -- '*.build' '*.py' | grep -E '^\+[^+]' | sed 's/^+//')
+diff=$(git diff -U0 --no-color --submodule=diff "${newest_common_ancestor_sha}" -- '*.build' '*.py' | grep -E '^\+[^+]' | grep -v '^Submodule ' | sed 's/^+//')
 
 ## List of commonly used utilities on Unix world
 ## See the context: https://gitlab.gnome.org/GNOME/gimp/-/issues/11385
@@ -168,7 +168,7 @@ printf "\e[0Ksection_end:`date +%s`:nonunix_test\r\e[0K\n"
 # 1) contain bash shebang or are called by bash;
 # 2) contain bashisms.
 printf "\e[0Ksection_start:`date +%s`:unix_test[collapsed=false]\r\e[0KChecking for Unix portability (optional)\n"
-diff=$(git diff -U0 --no-color "${newest_common_ancestor_sha}" | grep -E '^\+[^+]' | sed 's/^+//')
+diff=$(git diff -U0 --no-color --submodule=diff "${newest_common_ancestor_sha}" | grep -E '^\+[^+]' | grep -v '^Submodule ' | sed 's/^+//')
 
 ## Check shebang and external call (1)
 echo "$diff" | grep -E '^#!\s*/usr/bin/env\s+bash|^#!\s*/(usr/bin|bin)/bash(\s|$)' && found_bashism='extrinsic_bashism'