more paths

.github/workflows/desktop-lint.yml

@@ -1,14 +1,30 @@
 name: Code Style (C++) 
 
 on:
+  push:
+    branches:
+      - master
+    paths:
+      - '**'
+      - '!**.md'
+      - '!.github/**'
+      - '!.husky/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '!webclient/**'
+      - '.github/workflows/desktop-lint.yml'
+      - '.ci/lint_cpp.sh'
+      - '.clang-format'
+      - '.cmake-format.json'
+      - 'format.sh'
   pull_request:
     paths:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.ci/**'
       - '!.github/**'
-      - '!.husky'
-      - '!.tx'
+      - '!.husky/**'
+      - '!.tx/**'
       - '!doc/**'
       - '!webclient/**'
       - '.github/workflows/desktop-lint.yml'

.github/workflows/translations-pull.yml

@@ -7,6 +7,7 @@ on:
     - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
+      - '.tx/**'
       - '.github/workflows/translations-pull.yml'
 
 jobs:

.github/workflows/translations-push.yml

@@ -7,6 +7,7 @@ on:
     - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
+      - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
 
 jobs:

.github/workflows/web-build.yml

@@ -5,14 +5,16 @@ on:
     branches:
       - master
     paths:
-      - '.github/workflows/web-*.yml'
+      - '.husky/**'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-build.yml'
   pull_request:
     paths:
-      - '.github/workflows/web-*.yml'
+      - '.husky/**'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-build.yml'
 
 jobs:
   build-web:

.github/workflows/web-lint.yml

@@ -1,11 +1,18 @@
 name: Code Style (TypeScript) 
 
 on:
-  pull_request:
+  push:
+    branches:
+      - master
     paths:
-      - '.github/workflows/web-*.yml'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-lint.yml'
+  pull_request:
+    paths:
+      - 'webclient/**'
+      - '!**.md'
+      - '.github/workflows/web-lint.yml'
 
 jobs:
   ESLint:

format.sh

@@ -12,18 +12,18 @@ olddir="$PWD"
 cd "${BASH_SOURCE%/*}/" || exit 2 # could not find path, this could happen with special links etc.
 
 # defaults
-include=("common" \
-"cockatrice/src" \
+include=("cockatrice/src" \
+"common" \
 "dbconverter/src" \
 "oracle/src" \
 "servatrice/src" \
 "tests")
-exclude=("servatrice/src/smtp" \
-"common/sfmt" \
+exclude=("common/sfmt" \
 "common/lib" \
 "oracle/src/zip" \
 "oracle/src/lzma" \
-"oracle/src/qt-json")
+"oracle/src/qt-json" \
+"servatrice/src/smtp")
 exts=("cpp" "h" "proto")
 cf_cmd="clang-format"
 branch="origin/master"