Merge pull request #1821 from peternewman/0.10-clang-latest

Fix configure when lint tools are missing. Closes #1820
OpenLightingProject · Feb 25, 2023 · e523002 · e523002
2 parents 74f80b2 + 688cfe1
commit e523002
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -136,18 +136,9 @@ jobs:
       - name: Install build tools
         shell: bash
         run: |
-          apt-get -y install pkg-config libtool autoconf \
-            automake g++ bison flex make bash-completion dh-autoreconf \
-            debhelper devscripts wget python3-pip
+          apt-get -y install make python3-pip
       - name: Install Python lint tools
-        run: python3 -m pip install --no-input cpplint flake8
-      - name: Install build dependencies
-        shell: bash
-        run: |
-          apt-get -y install libcppunit-dev uuid-dev libncurses5-dev \
-            libmicrohttpd-dev protobuf-compiler python3-protobuf \
-            libprotobuf-dev libprotoc-dev zlib1g-dev libftdi-dev \
-            libusb-1.0-0-dev liblo-dev libavahi-client-dev python3-numpy
+        run: python3 -m pip install --no-input cpplint
       - name: Enable Problem Matcher for GitHub annotations
         run: echo "::add-matcher::.github/problem-matcher-lint-cpplint.json"
       - name: cpplint
@@ -178,20 +169,11 @@ jobs:
       - name: Install build tools
         shell: bash
         run: |
-          apt-get -y install pkg-config libtool autoconf \
-            automake g++ bison flex make bash-completion dh-autoreconf \
-            debhelper devscripts wget python3-pip
+          apt-get -y install make python3-pip
       - name: Install Python lint tools
-        run: python3 -m pip install --no-input cpplint flake8
+        run: python3 -m pip install --no-input flake8
       - name: Setup flake8 annotations
         uses: rbialon/flake8-annotations@v1
-      - name: Install build dependencies
-        shell: bash
-        run: |
-          apt-get -y install libcppunit-dev uuid-dev libncurses5-dev \
-            libmicrohttpd-dev protobuf-compiler python3-protobuf \
-            libprotobuf-dev libprotoc-dev zlib1g-dev libftdi-dev \
-            libusb-1.0-0-dev liblo-dev libavahi-client-dev python3-numpy
       - name: flake8
         run: make flake8 VERBOSE=1
   spellintian:

diff --git a/Makefile.am b/Makefile.am
@@ -261,5 +261,5 @@ cpplint: Makefile.am
 if FOUND_CPPLINT
 	cpplint --filter=$(CPP_LINT_FILTER) $(CPP_LINT_FILES)
 else
-  $(error cpplint not found. Install forked cpplint (e.g. via pip for the latest version) and re-run configure.)
+	$(error cpplint not found. Install the forked cpplint (e.g. via pip for the latest version) and re-run configure.)
 endif