Maybe these conflicts also

cvvergara · Oct 24, 2024 · bf67b27 · bf67b27
1 parent faaddf6
commit bf67b27
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -69,7 +69,6 @@ jobs:
           make install
 
       - name: Install pgTAP
-        if: false
         run: |
           git clone https://github.com/theory/pgtap.git pgTapExtension
           cd pgTapExtension
@@ -79,7 +78,6 @@ jobs:
           ln -s $(find `brew --prefix` -name pg_prove) symlink it into $(brew --prefix)/bin
 
       - name: Test
-        if: false
         run: |
           export PATH=$(brew --prefix)/Cellar/perl/$(perl -e 'print substr($^V, 1)')/bin:$PATH
           pg_ctl -D $(brew --prefix)/var/postgresql@14 start

diff --git a/docqueries/version/full_version.result b/docqueries/version/full_version.result
@@ -4,9 +4,9 @@ SET client_min_messages TO NOTICE;
 SET
 /* -- q1 */
 SELECT version, library FROM pgr_full_version();
-  version  |     library
------------+-----------------
- 3.7.0 | pgrouting-3.7.0
+ version |     library
+---------+-----------------
+ 3.7.0   | pgrouting-3.7.0
 (1 row)
 
 /* -- q2 */

diff --git a/include/cpp_common/rule.hpp b/include/cpp_common/rule.hpp
@@ -1,6 +1,5 @@
 /*PGR-GNU*****************************************************************
-
-FILE: rule.hpp
+File: rule.hpp
 
 Copyright (c) 2017 pgRouting developers
 Mail: [email protected]

diff --git a/tools/scripts/code_checker.sh b/tools/scripts/code_checker.sh
@@ -49,7 +49,7 @@ if test -z "$DIRECTORY"; then
     echo "--------------------"
     echo "------   *.c  ------"
     echo "--------------------"
-    code_linter/cpplint/cpplint.py --extensions=c --linelength=120 --filter=-readability/casting,-whitespace/newline src/*/*.c
+    code_linter/cpplint/cpplint.py --extensions=c  --linelength=120 --filter=-readability/casting src/*/*.c
     echo "--------------------"
     echo "------ *.cpp  ------"
     echo "--------------------"