fixup! format,ci: update clang-format to clang16

ornladios · Jul 28, 2023 · b1bb13f · b1bb13f
1 parent 22caa23
commit b1bb13f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scripts/ci/scripts/run-clang-format.sh b/scripts/ci/scripts/run-clang-format.sh
@@ -19,9 +19,7 @@ then
   echo "clang-format:"
   echo "  Code format checks failed."
   echo "  Please run clang-format v16 your changes before committing:"
-  echo "  You can use our CI image for this with:"
-  echo "  docker run -itt --mount type=bind,source=$(pwd),target=/root/adios2 ghcr.io/ornladios/adios2:ci-formatting"
-  echo "  cd /root/adios; scripts/ci/scripts/run-clang-format.sh"
+  echo "  You can use our CI image for this with: scripts/developer/run-clang-format.sh"
   echo "  The following changes are suggested:"
   echo "${DIFF}"
   echo "$(git diff --stat)"

diff --git a/scripts/developer/run-clang-format.sh b/scripts/developer/run-clang-format.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+exec sudo docker run -itt --mount type=bind,source="$(pwd)",target=/root/adios2 \
+  ghcr.io/ornladios/adios2:ci-formatting sh -c \
+  "git config --global --add safe.directory /root/adios2 &&
+   cd /root/adios2 &&
+   ./scripts/ci/scripts/run-clang-format.sh"