Merge branch 'renovate/cimg-android-2023.x' into 'develop'

Update cimg/android Docker tag to v2023

See merge request ultrasonic/ultrasonic!916
This commit is contained in:
birdbird 2023-03-08 13:10:45 +00:00
commit bde6dd3708
2 changed files with 7 additions and 7 deletions

View File

@ -18,7 +18,7 @@ jobs:
command: echo This build will be done in GitLab CI command: echo This build will be done in GitLab CI
Check Style: Check Style:
docker: docker:
- image: cimg/android:2022.12.1 - image: cimg/android:2023.02.1
working_directory: ~/ultrasonic working_directory: ~/ultrasonic
environment: environment:
JVM_OPTS: << pipeline.parameters.memory-config >> JVM_OPTS: << pipeline.parameters.memory-config >>
@ -40,7 +40,7 @@ jobs:
key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }} key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
Static Analysis: Static Analysis:
docker: docker:
- image: cimg/android:2022.12.1 - image: cimg/android:2023.02.1
working_directory: ~/ultrasonic working_directory: ~/ultrasonic
environment: environment:
JVM_OPTS: << pipeline.parameters.memory-config >> JVM_OPTS: << pipeline.parameters.memory-config >>
@ -62,7 +62,7 @@ jobs:
key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }} key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
Lint: Lint:
docker: docker:
- image: cimg/android:2022.12.1 - image: cimg/android:2023.02.1
working_directory: ~/ultrasonic working_directory: ~/ultrasonic
environment: environment:
JVM_OPTS: << pipeline.parameters.memory-config >> JVM_OPTS: << pipeline.parameters.memory-config >>
@ -84,7 +84,7 @@ jobs:
key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }} key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
Unit Tests: Unit Tests:
docker: docker:
- image: cimg/android:2022.12.1 - image: cimg/android:2023.02.1
working_directory: ~/ultrasonic working_directory: ~/ultrasonic
environment: environment:
JVM_OPTS: << pipeline.parameters.memory-config >> JVM_OPTS: << pipeline.parameters.memory-config >>
@ -106,7 +106,7 @@ jobs:
key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }} key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
Assemble Debug: Assemble Debug:
docker: docker:
- image: cimg/android:2022.12.1 - image: cimg/android:2023.02.1
working_directory: ~/ultrasonic working_directory: ~/ultrasonic
environment: environment:
JVM_OPTS: << pipeline.parameters.memory-config >> JVM_OPTS: << pipeline.parameters.memory-config >>
@ -128,7 +128,7 @@ jobs:
key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }} key: ultrasonic-{{ .Branch }}-{{ checksum "gradle/libs.versions.toml" }}
Assemble Release: Assemble Release:
docker: docker:
- image: cimg/android:2022.12.1 - image: cimg/android:2023.02.1
working_directory: ~/ultrasonic working_directory: ~/ultrasonic
environment: environment:
JVM_OPTS: << pipeline.parameters.memory-config >> JVM_OPTS: << pipeline.parameters.memory-config >>

View File

@ -1,5 +1,5 @@
default: default:
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/cimg/android:2022.12.1 image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/cimg/android:2023.02.1
cache: cache:
key: ${CI_COMMIT_REF_SLUG} key: ${CI_COMMIT_REF_SLUG}
paths: paths: