Testing different clang format version

Team846 · Dec 20, 2024 · ebee109 · ebee109
1 parent 7db575d
commit ebee109
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/compilation_check.yaml b/.github/workflows/compilation_check.yaml
@@ -72,9 +72,9 @@ jobs:
           sudo apt-get install -y wget lsb-release software-properties-common
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
-          sudo apt-get install -y clang-format-17
-          sudo ln -sf /usr/bin/clang-format-17 /usr/bin/clang-format
+          sudo ./llvm.sh 18
+          sudo apt-get install -y clang-format-18
+          sudo ln -sf /usr/bin/clang-format-18 /usr/bin/clang-format
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/formatting_check.yaml b/.github/workflows/formatting_check.yaml
@@ -23,9 +23,9 @@ jobs:
           sudo apt-get install -y wget lsb-release software-properties-common
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
-          sudo apt-get install -y clang-format-17
-          sudo ln -sf /usr/bin/clang-format-17 /usr/bin/clang-format
+          sudo ./llvm.sh 18
+          sudo apt-get install -y clang-format-18
+          sudo ln -sf /usr/bin/clang-format-18 /usr/bin/clang-format
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/build.gradle b/build.gradle
@@ -111,7 +111,7 @@ spotless {
             include '**/*.cpp', '**/*.cc', '**/*.h', '**/*.hpp'
             exclude '**/build/**', '**/build-*/**'
         }
-        def selectedClangVersion = project.hasProperty('fromCI') ? '17.0.6' : '18.1.8'
+        def selectedClangVersion = project.hasProperty('fromCI') ? '18.1.8' : '18.1.8'
 
         def styleFile = file('style.standard')
         def styleConfig = styleFile.text.trim()