Skip to content

Commit 51dc2f3

Browse files
committed
output a diff when formatting meson
1 parent a018177 commit 51dc2f3

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

.github/workflows/format.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on: [push, pull_request]
33
jobs:
44
meson-format-check:
55
runs-on: ubuntu-latest
6+
name: Meson Format Check
67
steps:
78
- uses: actions/checkout@v2
89
- name: Add LLVM APT repository
@@ -20,9 +21,11 @@ jobs:
2021
python3 -m pip install meson==1.10.0
2122
- name: Meson format check
2223
run: |
23-
meson format --check-only --recursive meson.build
24+
meson format --check-diff meson.build
25+
find modules/ -name 'meson.build' -exec meson format --check-diff {} \;
2426
code-format-check:
2527
runs-on: ubuntu-latest
28+
name: Check code formatting with clang-format and clang-tidy
2629
steps:
2730
- uses: actions/checkout@v2
2831
- name: Add LLVM APT repository

meson.build

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ gtest_main = dependency(
2020
required: tests_opt,
2121
)
2222

23-
doxygen = find_program('doxygen', required: docs_opt)
23+
doxygen = find_program(
24+
'doxygen',
25+
required: docs_opt,
26+
)
2427

2528
subdir('modules/concurrent')
2629

@@ -37,5 +40,8 @@ if doxygen.found()
3740
},
3841
)
3942

40-
run_target('doxygen',command: [doxygen, doxygen_config])
43+
run_target(
44+
'doxygen',
45+
command: [doxygen, doxygen_config],
46+
)
4147
endif

0 commit comments

Comments
 (0)