diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /.github/workflows/format.yml | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to '.github/workflows/format.yml')
| -rw-r--r-- | .github/workflows/format.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 9ebacc03..714c60bf 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -2,11 +2,12 @@ name: Code formatting on: pull_request: - branches: [ master, develop ] + branches: [ develop ] paths: - '**.cpp' - '**.h' - '!src/libs/**' + - '!src/FreeRTOS/**' jobs: test-format: @@ -18,8 +19,6 @@ jobs: - name: Configure git run: | - git config --global user.email "-" - git config --global user.name "Autoformatter" git fetch origin "$GITHUB_BASE_REF":"$GITHUB_BASE_REF" --depth=1000 - name: Install clang-format |