删除 .gradle/caches/build-cache-1 缓存目录

.gitlab-ci.yml

@@ -1,43 +1,43 @@
 stages:
-  - analysis
-  - sendmail
+  - android-build
+  - docker-build
 
-## 代码检查
-sonarqube_analysis:
+android_build:
   tags:
     - offline-test
-  stage: analysis
-  image: sonarsource/sonar-scanner-cli:latest
-  dependencies: []    #禁止传递来的artifact
+  stage: android-build
+  image: hub.shanqu.cc/devops/ci-android:jdk11
+  variables:
+    KUBERNETES_CPU_LIMIT: "16"
+    GIT_SUBMODULE_STRATEGY: recursive
+    Apk_Path: "app/build/outputs/apk/**/release/*.apk"
   script:
-    ## 获取项目的一级组和二级组和项目名作为projectKey，例如projectKey=platform-backend-eci-monitor
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - sonar-scanner
-      -Dsonar.host.url=http://sonarqube-server.sonarqube:9000/
-      -Dsonar.login=be43de7264ce4c4766eb0c020373c3e74e6df257
-      -Dsonar.jacoco.reportPaths=target/jacoco.exec
-      -Dsonar.projectKey=$group
-      -Dsonar.projectName=$CI_PROJECT_PATH
-      -Dsonar.sourceEncoding=UTF-8
-      -Dsonar.exclusions=**/vendor/**,**/errcode/**
-      -Dsonar.gitlab.project_id=$CI_PROJECT_ID
-      -Dsonar.gitlab.commit_sha=$CI_COMMIT_SHA
-      -Dsonar.gitlab.ref_name=$CI_COMMIT_REF_NAME
-      -Dsonar.gitlab.ci_merge_request_iid=$CI_MERGE_REQUEST_IID
-      -Dsonar.gitlab.merge_request_discussion=true
-      -Dsonar.java.binaries=.                 # 如果不使用Maven或Gradle进行分析，则必须手动提供测试二进制文件
+    - export GRADLE_USER_HOME=./.gradle
+    - chmod +x ./gradlew
+    - ./scripts/jenkins_build.sh -c
+    - rm -rf ./.gradle/caches/build-cache-1
+  cache:
+    paths:
+      - .gradle
   only:
-    - dev
- 
-## 发送简易检测结果报告
-send_sonar_report:
+    - feature-ci
+
+# 构建推送docker镜像
+docker-build:
   tags:
     - offline-test
-  stage: sendmail
+  stage: docker-build
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
   image: hub.shanqu.cc/library/docker:latest
-  dependencies: []    #禁止传递来的artifact
   script:
-    - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
+    - imageName=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
+    - docker build -t registry.cn-shenzhen.aliyuncs.com/ghzs/$imageName:latest .
+    - docker push registry.cn-shenzhen.aliyuncs.com/ghzs/$imageName:latest
+  cache:
+    paths:
+      - .gradle
+    policy: pull
   only:
-    - dev
+    - feature-ci
+

.gitmodules

@@ -1,13 +1,13 @@
 [submodule "libraries/LGLibrary"]
 	path = libraries/LGLibrary
-	url = git@git.shanqu.cc:android/common-library.git
+	url = ../../../android/common-library.git
 	branch = master
 [submodule "vspace-bridge"]
 	path = vspace-bridge
-	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git
+	url = ../../../cwzs/android/vspace-bridge.git
 [submodule "module_common/src/debug/assets/assistant-android-mock"]
 	path = module_common/src/debug/assets/assistant-android-mock
-	url = git@git.shanqu.cc:halo/android/assistant-android-mock.git
+	url = ../../../halo/android/assistant-android-mock.git
 [submodule "ndownload"]
 	path = ndownload
-	url = git@git.shanqu.cc:android/ndownload.git
+	url = ../../../android/ndownload.git

Dockerfile

@@ -0,0 +1,18 @@
+FROM openjdk:11-jdk
+WORKDIR /project
+ARG CI_PROJECT_PATH=default_value
+SHELL ["/bin/bash", "-c"]
+#配置SDK环境变量
+ENV ANDROID_SDK_ROOT /usr/lib/sdk
+ENV ANDROID_HOME /usr/lib/sdk
+ENV PATH $ANDROID_SDK_ROOT:$PATH
+ENV PATH=$PATH:${ANDROID_HOME}/cmdline-tools/cmdline-tools/bin/
+ENV GRADLE_USER_HOME /project/.gradle
+
+RUN source ~/.bashrc
+RUN sed -i "s@http://\(deb\|security\).debian.org@https://mirrors.aliyun.com@g" /etc/apt/sources.list \
+    && apt-get --quiet update --yes \
+    && apt-get --quiet install --yes wget lib32stdc++6 lib32z1 libncurses5  \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY  . /project

app/build.gradle

@@ -534,4 +534,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

build.gradle

@@ -7,6 +7,13 @@ buildscript {
     ext.kotlin_version = '1.7.20'
 
     repositories {
+        maven {
+            url "https://nexus.shanqu.cc/repository/lightgame-public/"
+            credentials {
+                username("lg_android")
+                password("u9gZYH4MQEwLLQZK")
+            }
+        }
         google()
         jcenter()
         mavenCentral()
@@ -73,4 +80,4 @@ subprojects {
                 }
             }
         }
-}
+}

gradle.properties

@@ -13,7 +13,7 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Wed Jul 19 10:16:09 CST 2017
-org.gradle.jvmargs=-Xmx2048m -XX\:MaxPermSize\=512m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8
+org.gradle.jvmargs=-Xmx8192m -XX\:MaxPermSize\=8192m -XX\:+HeapDumpOnOutOfMemoryError -Dfile.encoding\=UTF-8 
 #开启gradle并行编译
 org.gradle.parallel=true
 #开启守护进程
@@ -75,5 +75,3 @@ android.injected.testOnly = false
 
 # 动态配置插件
 isRelease = true
-
-

scripts/jenkins_build.sh

@@ -29,10 +29,10 @@ do
     post_init_script=init.compose.gradle
 done
 
-./gradlew rIR -I ${post_init_script}
+./gradlew rIR -I ${post_init_script} --profile
 mv app/build/outputs/apk/internal/release/app-internal-release.apk app/build/tmp/${version}-${versionCode}-test-${build_time}.apk
 
 git checkout app/build.gradle
 git checkout module_common/build.gradle
 git checkout gradle.properties
-rm app/src/main/assets/gitlog.txt
+rm app/src/main/assets/gitlog.txt