Skip to content

Commit e523002

Browse files
authored
Merge pull request #1821 from peternewman/0.10-clang-latest
Fix configure when lint tools are missing. Closes #1820
2 parents 74f80b2 + 688cfe1 commit e523002

2 files changed

Lines changed: 5 additions & 23 deletions

File tree

.github/workflows/lint.yaml

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,9 @@ jobs:
136136
- name: Install build tools
137137
shell: bash
138138
run: |
139-
apt-get -y install pkg-config libtool autoconf \
140-
automake g++ bison flex make bash-completion dh-autoreconf \
141-
debhelper devscripts wget python3-pip
139+
apt-get -y install make python3-pip
142140
- name: Install Python lint tools
143-
run: python3 -m pip install --no-input cpplint flake8
144-
- name: Install build dependencies
145-
shell: bash
146-
run: |
147-
apt-get -y install libcppunit-dev uuid-dev libncurses5-dev \
148-
libmicrohttpd-dev protobuf-compiler python3-protobuf \
149-
libprotobuf-dev libprotoc-dev zlib1g-dev libftdi-dev \
150-
libusb-1.0-0-dev liblo-dev libavahi-client-dev python3-numpy
141+
run: python3 -m pip install --no-input cpplint
151142
- name: Enable Problem Matcher for GitHub annotations
152143
run: echo "::add-matcher::.github/problem-matcher-lint-cpplint.json"
153144
- name: cpplint
@@ -178,20 +169,11 @@ jobs:
178169
- name: Install build tools
179170
shell: bash
180171
run: |
181-
apt-get -y install pkg-config libtool autoconf \
182-
automake g++ bison flex make bash-completion dh-autoreconf \
183-
debhelper devscripts wget python3-pip
172+
apt-get -y install make python3-pip
184173
- name: Install Python lint tools
185-
run: python3 -m pip install --no-input cpplint flake8
174+
run: python3 -m pip install --no-input flake8
186175
- name: Setup flake8 annotations
187176
uses: rbialon/flake8-annotations@v1
188-
- name: Install build dependencies
189-
shell: bash
190-
run: |
191-
apt-get -y install libcppunit-dev uuid-dev libncurses5-dev \
192-
libmicrohttpd-dev protobuf-compiler python3-protobuf \
193-
libprotobuf-dev libprotoc-dev zlib1g-dev libftdi-dev \
194-
libusb-1.0-0-dev liblo-dev libavahi-client-dev python3-numpy
195177
- name: flake8
196178
run: make flake8 VERBOSE=1
197179
spellintian:

Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,5 +261,5 @@ cpplint: Makefile.am
261261
if FOUND_CPPLINT
262262
cpplint --filter=$(CPP_LINT_FILTER) $(CPP_LINT_FILES)
263263
else
264-
$(error cpplint not found. Install forked cpplint (e.g. via pip for the latest version) and re-run configure.)
264+
$(error cpplint not found. Install the forked cpplint (e.g. via pip for the latest version) and re-run configure.)
265265
endif

0 commit comments

Comments
 (0)