Remove unsupported flag for tar and update workflows

rajutkarsh07 · Oct 19, 2022 · 06143a1 · 06143a1
1 parent 3ed742a
commit 06143a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.github/workflows/lint_changed_files.yml b/.github/workflows/lint_changed_files.yml
@@ -116,7 +116,10 @@ jobs:
 
           files=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep 'package\.json$' | grep -v 'datapackage\.json$')
           if [ -n "${files}" ]; then
+            echo "Linting package.json files that have changed..."
             echo "${files}" | "${lint_package_json}"
+          else
+            echo "No package.json files to lint."
           fi
 
       # Lint REPL help files...
@@ -229,6 +232,12 @@ jobs:
           # Define the path to cppcheck configuration file for linting benchmarks:
           cppcheck_benchmarks_suppressions_list="${root}/etc/cppcheck/suppressions.benchmarks.txt"
 
+          # Install cppcheck if C files have changed:
+          files=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep -E '\.c$|\.h$' | tr '\n' ' ' | sed 's/ $//')
+          if [[ -n "${files}" ]]; then
+            make install-deps-cppcheck
+          fi
+
           # Lint C source files...
           files=$(echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr ' ' '\n' | grep -E '\.c$' | grep -v -e '/examples' -e '/test' -e '/benchmark' | tr '\n' ' ' | sed 's/ $//')
           if [[ -n "${files}" ]]; then

diff --git a/tools/make/lib/install/cppcheck.mk b/tools/make/lib/install/cppcheck.mk
@@ -71,7 +71,7 @@ ifeq ($(OS), WINNT)
 	$(QUIET) $(UNZIP) -q $(DEPS_CPPCHECK_DOWNLOAD_OUT) -d $@
 else
 	$(QUIET) echo 'Extracting cppcheck...' >&2
-	$(QUIET) $(TAR) --xz -xvf $(DEPS_CPPCHECK_DOWNLOAD_OUT) -C $(DEPS_BUILD_DIR)
+	$(QUIET) $(TAR) -xvf $(DEPS_CPPCHECK_DOWNLOAD_OUT) -C $(DEPS_BUILD_DIR)
 	$(QUIET) mv $(deps_cppcheck_extract_out) $(DEPS_CPPCHECK_BUILD_OUT)
 endif