Misc. operability tweaks for clang-format (#5422)

Found while debugging CI fails on #5421. --- TYPE: NO_HISTORY --------- Co-authored-by: Theodore Tsirpanis <[email protected]>
TileDB-Inc · Jan 10, 2025 · 0aecf50 · 0aecf50
1 parent 1282910
commit 0aecf50
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -36,8 +36,5 @@ jobs:
           printenv
         shell: bash
 
-      - name: Check formatting (linux only)'
-        run: |
-          source $GITHUB_WORKSPACE/scripts/ci/check_formatting_linux.sh
-        shell: bash
-        if: ${{ runner.os == 'Linux' }}
+      - name: Check formatting
+        run: $GITHUB_WORKSPACE/scripts/ci/check_formatting_linux.sh
diff --git a/scripts/ci/check_formatting_linux.sh b/scripts/ci/check_formatting_linux.sh
@@ -32,7 +32,7 @@ set -e pipefail
 ls -la
 sudo ./scripts/install-clangformat.sh
 
-src=$GITHUB_WORKSPACE
+src=$(dirname $0)/../..
 cd $src
 
 $src/scripts/run-clang-format.sh $src clang-format-17 0
diff --git a/scripts/install-clangformat.sh b/scripts/install-clangformat.sh
@@ -58,6 +58,10 @@ install_clang_format() {
 
 run() {
   install_clang_format
+
+  echo
+  echo "clang-format --version" $(clang-format --version)
+  echo
 }
 
 run
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,10 @@ install_clang_format() { @@
     run() {
       install_clang_format
+      echo
+      echo "clang-format --version" $(clang-format --version)
+      echo
     }
     run