Merge remote-tracking branch 'origin/master'

CppCXY · Sep 29, 2024 · e728970 · e728970
2 parents 4ab859f + 5cb772d
commit e728970
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -94,7 +94,7 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
       - name: Download
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
       - name: Display structure of downloaded files
         run: ls -R
       - name: zip win32-x64

diff --git a/CodeFormat/src/LuaCheck.cpp b/CodeFormat/src/LuaCheck.cpp
@@ -112,6 +112,7 @@ bool LuaCheck::CheckSingleFile(const FormatContext &context, std::string_view pa
 
 bool LuaCheck::CheckWorkspace(const FormatContext &context) {
     auto workspace = context.GetWorkspace();
+    bool diagnosis = false;
     FileFinder finder(workspace);
     finder.AddFindExtension(".lua");
     finder.AddFindExtension(".lua.txt");
@@ -136,10 +137,12 @@ bool LuaCheck::CheckWorkspace(const FormatContext &context) {
             auto style = context.GetStyle(relativePath);
             if (CheckSingleFile(context, relativePath, std::move(opText.value()), style)) {
                 std::cerr << util::format("Check {} ok.", relativePath) << std::endl;
+            } else {
+                diagnosis = true;
             }
         } else {
             std::cerr << util::format("Can not read file {}", relativePath) << std::endl;
         }
     }
-    return true;
-}
+    return !diagnosis;
+}