Clang-format

marianabuhazi · May 7, 2024 · 9d2b1a0 · 9d2b1a0
1 parent 4e1122f
commit 9d2b1a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/regression-test.yaml b/.github/workflows/regression-test.yaml
@@ -24,10 +24,10 @@ jobs:
           pip3 install vsg
           echo 'export PATH="$PATH:/home/espuser/.local/bin/"' >> ~/.bashrc
 
-      # - name: Install clang-format-10
-      #   run: |
-      #     sudo apt-get update
-      #     sudo apt-get install clang-format-10
+      - name: Install clang-format
+        run: |
+          sudo apt-get update
+          sudo apt-get install clang-format
 
       - name: Install autopep8
         run: |

diff --git a/utils/scripts/actions-pipeline/code-format/format_modified.sh b/utils/scripts/actions-pipeline/code-format/format_modified.sh
@@ -77,8 +77,8 @@ esac
     local output
     case "$type" in
         c | h | cpp | hpp)
-		# Format with clang-format-10
-            output=$(clang-format-10 $clang_format_edit "$file_to_format" 2>&1);;
+		# Format with clang-format
+            output=$(clang-format $clang_format_edit "$file_to_format" 2>&1);;
         py)
 		# Format with autopep8
             output=$(python3 -m autopep8 $autopep8_edit -a -a "$file_to_format" 2>&1);;

diff --git a/utils/scripts/actions-pipeline/code-format/format_repo.sh b/utils/scripts/actions-pipeline/code-format/format_repo.sh
@@ -2,7 +2,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 #   This program recurses through all directories in  #
 #   the /esp repository and formats all files using   #
-#   clang-format-10, autopep8, verible, or vsg.       #
+#   clang-format, autopep8, verible, or vsg.       #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 
 # Output styles
@@ -71,7 +71,7 @@ find_c_h_files() {
   	local output
     if [[ -f "$file" ]]; then
 	  echo -n "Formatting $(basename "$file")..."
-      output=$(clang-format-10 -i "$file" 2>&1)
+      output=$(clang-format -i "$file" 2>&1)
 	  if [ ! $? -eq 0 ]; then
 		echo -e " ${RED}FAILED${NC}"
 		echo "$output" | sed 's/^/  /'
@@ -92,7 +92,7 @@ find_cpp_hpp_files() {
   for file in "$dir"/*.cpp "$dir"/*.hpp; do
     if [[ -f "$file" ]]; then
 	  echo -n "Formatting $(basename "$file")..."
-      output=$(clang-format-10 -i "$file" 2>&1)
+      output=$(clang-format -i "$file" 2>&1)
 	  if [ ! $? -eq 0 ]; then
 		echo -e " ${RED}FAILED${NC}"
 		echo "$output" | sed 's/^/  /'