diff --git a/.github/workflows/desktop-lint.yml b/.github/workflows/desktop-lint.yml index b8c015c16..adc4a8860 100644 --- a/.github/workflows/desktop-lint.yml +++ b/.github/workflows/desktop-lint.yml @@ -1,18 +1,19 @@ name: Code Style (C++) on: + # push trigger not needed for linting, we do not allow direct pushes to master pull_request: paths: - '*/**' # matches all files not in root - '!**.md' - '!.ci/**' - '!.github/**' - - '!.husky' - - '!.tx' + - '!.husky/**' + - '!.tx/**' - '!doc/**' - '!webclient/**' - - '.github/workflows/desktop-lint.yml' - '.ci/lint_cpp.sh' + - '.github/workflows/desktop-lint.yml' - '.clang-format' - '.cmake-format.json' - 'format.sh' diff --git a/.github/workflows/translations-pull.yml b/.github/workflows/translations-pull.yml index 54bc76b19..7834e06b0 100644 --- a/.github/workflows/translations-pull.yml +++ b/.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: diff --git a/.github/workflows/translations-push.yml b/.github/workflows/translations-push.yml index 5e299bf1f..927b3d5a1 100644 --- a/.github/workflows/translations-push.yml +++ b/.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: diff --git a/.github/workflows/web-build.yml b/.github/workflows/web-build.yml index f328fac88..aba0dbf0b 100644 --- a/.github/workflows/web-build.yml +++ b/.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: diff --git a/.github/workflows/web-lint.yml b/.github/workflows/web-lint.yml index 7a962ea55..cb712dd58 100644 --- a/.github/workflows/web-lint.yml +++ b/.github/workflows/web-lint.yml @@ -1,11 +1,12 @@ name: Code Style (TypeScript) on: + # push trigger not needed for linting, we do not allow direct pushes to master pull_request: paths: - - '.github/workflows/web-*.yml' - 'webclient/**' - '!**.md' + - '.github/workflows/web-lint.yml' jobs: ESLint: diff --git a/format.sh b/format.sh index 8c60f3f8a..1e88c9862 100755 --- a/format.sh +++ b/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"