From 1e3c148b5f5071612f20f05cd92fcae57a181817 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 15 Feb 2023 00:20:20 +0100 Subject: [PATCH] Fix missing submodule in CI after Scintilla update Remove scintilla from 'git diff' checks, since it doesn't recurse into submodules by default. --- .cirrus.yml | 2 +- .github/workflows/code_checks.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4b710c6c94..f5e1248a3b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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 diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml index c92ec51414..065271f877 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/code_checks.yml @@ -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