Ver código fonte

Try specifying clang-format exe path to spotless

Mario Zechner 4 anos atrás
pai
commit
1ec5c46361
2 arquivos alterados com 17 adições e 2 exclusões
  1. 16 1
      .github/workflows/format-check.yml
  2. 1 1
      formatters/build.gradle

+ 16 - 1
.github/workflows/format-check.yml

@@ -13,6 +13,20 @@ jobs:
         sudo apt update
         sudo apt install -y --force-yes curl xz-utils libicu-dev git        
 
+    - name: Cache Clang
+      id: cache-clang
+      uses: actions/cache@v2
+      with:
+        path: clang
+        key: ${{ runner.os }}-clang
+
+    - name: Install Clang
+      if: steps.cache-clang.outputs.cache-hit != 'true'
+      run: |
+        curl -L https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/clang+llvm-12.0.1-x86_64-linux-gnu-ubuntu-16.04.tar.xz --output clang.tar.xz
+        tar -xf clang.tar.xz
+        mv clang+llvm-12.0.1-x86_64-linux-gnu-ubuntu- clang
+
     - name: Install dotnet
       uses: actions/setup-dotnet@v1
       with:
@@ -35,7 +49,8 @@ jobs:
         java-version: "16"          
                 
     - name: Format   
-      run: |         
+      run: | 
+        export CLANGFORMAT=`pwd`/clang/bin/clang-format
         export PATH="$PATH:/root/.dotnet/tools"      
         ./formatters/format.sh
 

+ 1 - 1
formatters/build.gradle

@@ -26,7 +26,7 @@ spotless {
                'spine-sfml/**/*.h',
                'spine-ue4/**/*.cpp',
                'spine-ue4/**/*.h'
-        clangFormat('11.0.0-2~ubuntu20.04.1').style('file')
+        clangFormat().pathToExe("$System.env.CLANGFORMAT").style('file')
     }
 
     typescript {