合并分支 'master' 到 'beta'

Master

查看合并请求 basic/basic-api-project!3

.gitlab-ci.yml

@@ -16,8 +16,7 @@ stages:
 # 缓存配置
 cache:
   paths:
-    - .gradle/wrapper
-    - .gradle/caches
+    - /root/.gradle
 
 # 编译项目
 build-job:

build.gradle

@@ -123,21 +123,23 @@ subprojects {
 }
 
 task hooks() {
-// GitHook pre-commit (spotless, spotbugs)
-def hook = new File("$rootProject.projectDir/.git/hooks/pre-commit")
-hook.text = """#!/bin/bash
-#set -x
-
-./gradlew spotlessCheck
-
-RESULT=\$?
-exit \$RESULT
-"""
+    try {
+        // GitHook pre-commit (spotless, spotbugs)
+        def hook = new File("$rootProject.projectDir/.git/hooks/pre-commit")
+        hook.text = """#!/bin/bash
+        #set -x
+        
+        ./gradlew spotlessCheck
+        
+        RESULT=\$?
+        exit \$RESULT
+        """
+    } catch (ignored) {}
 }
 
 gradle.getTaskGraph().whenReady {
     def skipHooks = gradle.startParameter.getSystemPropertiesArgs().containsKey('skip-hooks')
-    printf("skipHooks: %s\n", skipHooks)
+    printf("skip-hooks: %s", skipHooks)
     if (!skipHooks) {
         hooks
     }