Merge branch 'fix_pex_pipeline' into 'main'

let's try this again...

See merge request !1337

ci/bin/generate-yaml.py

@@ -105,7 +105,7 @@ def main(argv):
         # Get list of files that have changed from commit SHA
         # git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA
         sp = subprocess.run(
-            ["git", "diff-tree", "--no-commit-id", "--name-only", "-r", f"{commit_sha}"],
+            ["git", "diff-tree", "-m", "--no-commit-id", "--name-only", "-r", f"{commit_sha}"],
             stdout=subprocess.PIPE,
             universal_newlines=True,
         )