From 9c2eece929f41cb535391fe879d49e9323973f40 Mon Sep 17 00:00:00 2001
From: birdbird <6892457-tzugen@users.noreply.gitlab.com>
Date: Mon, 20 Mar 2023 08:37:19 +0000
Subject: [PATCH] Improve CI
---
.circleci/config.DISABLED.yml | 224 ----------------------------------
.gitlab-ci.yml | 4 +-
2 files changed, 2 insertions(+), 226 deletions(-)
delete mode 100644 .circleci/config.DISABLED.yml
diff --git a/.circleci/config.DISABLED.yml b/.circleci/config.DISABLED.yml
deleted file mode 100644
index 1471aee3..00000000
--- a/.circleci/config.DISABLED.yml
+++ /dev/null
@@ -1,224 +0,0 @@
-version: 2.1
-
-parameters:
- memory-config:
- type: string
- default: "-Xmx3200m -Xms256m -XX:MaxMetaspaceSize=1g"
- memory-config-debug:
- type: string
- default: "-Xmx3200m -Xms256m -XX:MaxMetaspaceSize=1g -verbose:gc -Xlog:gc*"
-
-jobs:
- Done in GitLab CI:
- docker:
- - image: busybox:stable
- steps:
- - run:
- name: Done in GitLab CI
- command: echo This build will be done in GitLab CI
- Check Style:
- docker:
- - image: cimg/android:2023.02.1
- working_directory: ~/ultrasonic
- environment:
- JVM_OPTS: << pipeline.parameters.memory-config >>
- JAVA_TOOL_OPTIONS: << pipeline.parameters.memory-config >>
- GRADLE_OPTS: << pipeline.parameters.memory-config >>
- steps:
- - checkout
- - restore_cache:
- keys:
- - ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - ultrasonic-{{ .Branch }}
- - ultrasonic
- - run:
- name: Check Style
- command: ./gradlew -Pqc ktlintCheck
- - save_cache:
- paths:
- - ~/.gradle
- key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- Static Analysis:
- docker:
- - image: cimg/android:2023.02.1
- working_directory: ~/ultrasonic
- environment:
- JVM_OPTS: << pipeline.parameters.memory-config >>
- JAVA_TOOL_OPTIONS: << pipeline.parameters.memory-config >>
- GRADLE_OPTS: << pipeline.parameters.memory-config >>
- steps:
- - checkout
- - restore_cache:
- keys:
- - ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - ultrasonic-{{ .Branch }}
- - ultrasonic
- - run:
- name: Check Style
- command: ./gradlew -Pqc detekt
- - save_cache:
- paths:
- - ~/.gradle
- key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- Lint:
- docker:
- - image: cimg/android:2023.02.1
- working_directory: ~/ultrasonic
- environment:
- JVM_OPTS: << pipeline.parameters.memory-config >>
- JAVA_TOOL_OPTIONS: << pipeline.parameters.memory-config >>
- GRADLE_OPTS: << pipeline.parameters.memory-config >>
- steps:
- - checkout
- - restore_cache:
- keys:
- - ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - ultrasonic-{{ .Branch }}
- - ultrasonic
- - run:
- name: Lint
- command: ./gradlew :ultrasonic:lintRelease
- - save_cache:
- paths:
- - ~/.gradle
- key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- Unit Tests:
- docker:
- - image: cimg/android:2023.02.1
- working_directory: ~/ultrasonic
- environment:
- JVM_OPTS: << pipeline.parameters.memory-config >>
- JAVA_TOOL_OPTIONS: << pipeline.parameters.memory-config >>
- GRADLE_OPTS: << pipeline.parameters.memory-config >>
- steps:
- - checkout
- - restore_cache:
- keys:
- - ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - ultrasonic-{{ .Branch }}
- - ultrasonic
- - run:
- name: Check Style
- command: ./gradlew ciTest testDebugUnitTest
- - save_cache:
- paths:
- - ~/.gradle
- key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- Assemble Debug:
- docker:
- - image: cimg/android:2023.02.1
- working_directory: ~/ultrasonic
- environment:
- JVM_OPTS: << pipeline.parameters.memory-config >>
- JAVA_TOOL_OPTIONS: << pipeline.parameters.memory-config >>
- GRADLE_OPTS: << pipeline.parameters.memory-config >>
- steps:
- - checkout
- - restore_cache:
- keys:
- - ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - ultrasonic-{{ .Branch }}
- - ultrasonic
- - run:
- name: Assemble Debug
- command: ./gradlew assembleDebug
- - save_cache:
- paths:
- - ~/.gradle
- key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- Assemble Release:
- docker:
- - image: cimg/android:2023.02.1
- working_directory: ~/ultrasonic
- environment:
- JVM_OPTS: << pipeline.parameters.memory-config >>
- JAVA_TOOL_OPTIONS: << pipeline.parameters.memory-config >>
- GRADLE_OPTS: << pipeline.parameters.memory-config >>
- steps:
- - checkout
- - restore_cache:
- keys:
- - ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - ultrasonic-{{ .Branch }}
- - ultrasonic
- - run:
- name: Assemble Release
- command: ./gradlew assembleRelease
- - save_cache:
- paths:
- - ~/.gradle
- key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
- - store_artifacts:
- path: ultrasonic/build/outputs/apk/release/ultrasonic-release-unsigned.apk
- destination: ultrasonic-release-unsigned
-
-workflows:
- version: 2
- Check and Build:
- jobs:
- - Done in GitLab CI:
- filters:
- branches:
- only:
- - develop
- - master
- tags:
- only: /.*/
- - Check Style:
- filters:
- branches:
- ignore:
- - develop
- - master
- tags:
- ignore: /.*/
- - Static Analysis:
- filters:
- branches:
- ignore:
- - develop
- - master
- tags:
- ignore: /.*/
- - Lint:
- filters:
- branches:
- ignore:
- - develop
- - master
- tags:
- ignore: /.*/
- - Unit Tests:
- filters:
- branches:
- ignore:
- - develop
- - master
- tags:
- ignore: /.*/
- - Assemble Debug:
- requires:
- - Check Style
- - Static Analysis
- - Lint
- - Unit Tests
- filters:
- branches:
- ignore:
- - develop
- - master
- tags:
- ignore: /.*/
- - Assemble Release:
- requires:
- - Check Style
- - Static Analysis
- - Lint
- - Unit Tests
- filters:
- branches:
- ignore:
- - develop
- - master
- tags:
- ignore: /.*/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18fbf11f..f3e0535c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
default:
- image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/jangrewe/gitlab-ci-android:33
+ image: ${CUSTOM_IMAGE_PREFIX}birdbirdbyrd/gitlab-ci-android
cache: &global_cache
key:
files:
@@ -57,7 +57,7 @@ Lint:
cache:
# inherit all global cache settings
<<: *global_cache
- policy: pull
+ policy: pull-push
rules:
- if: $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_TAG || $CI_PROJECT_ID != $ROOT_PROJECT_ID
- if: $CI_PIPELINE_SOURCE == "merge_request_event"