Fix missing submodule in CI after Scintilla update

Remove scintilla from 'git diff' checks, since it doesn't recurse into submodules by default.
This commit is contained in:
Maarten Bent 2023-02-15 00:20:20 +01:00
parent a72108c657
commit 1e3c148b5f
No known key found for this signature in database
GPG key ID: 58AAEE3F4A4FD070
2 changed files with 2 additions and 4 deletions

View file

@ -58,7 +58,7 @@ task:
# Rather than getting all submodules, get just the ones we need, as we can
# use system libraries instead of the other ones.
update_submodules_script: |
git submodule update --init 3rdparty/catch 3rdparty/nanosvg
git submodule update --init 3rdparty/catch 3rdparty/nanosvg src/stc/scintilla src/stc/lexilla
ccache_cache:
folder: /tmp/ccache

View file

@ -56,8 +56,7 @@ jobs:
':!**/Info*.plist*' \
':!**/*.sln' \
':!**/*.vcproj' \
':!**/*.xpm' \
':!src/stc/scintilla/'
':!**/*.xpm'
check-mixed-eol:
@ -89,7 +88,6 @@ jobs:
git fetch --depth=1 origin master
if git diff origin/master \
':!.github/workflows/code_checks.yml' \
':!src/stc/scintilla/' \
| grep -E '^\+.*(wxOVERRIDE|wxNOEXCEPT|[^_@]NULL)'; then
echo "::error ::Please use C++11 equivalents of the deprecated macros in the new code."
exit 1