File tree 2 files changed +7
-8
lines changed
2 files changed +7
-8
lines changed Original file line number Diff line number Diff line change @@ -2,16 +2,13 @@ version: 2
2
2
3
3
jobs :
4
4
build :
5
- working_directory : /app
5
+ working_directory : ~ /app
6
6
docker :
7
- - image : docker:18.05.0-ce-git
7
+ - image : cimg/base:2024.10
8
8
steps :
9
9
- checkout
10
- - run :
11
- name : Install dependencies
12
- command : apk add --no-progress bash
13
10
- setup_remote_docker :
14
- version : 18.05.0-ce
11
+ version : docker24
15
12
- run :
16
13
name : Log in to Docker Hub
17
14
command : docker login -u mbgl -p ${DOCKER_PASS}
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ RUN set -eu \
32
32
RUN set -eu \
33
33
&& mkdir -p "${ANDROID_HOME}/licenses" \
34
34
&& echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > "${ANDROID_HOME}/licenses/android-sdk-license" \
35
- && tools/bin/sdkmanager \
35
+ && tools/bin/sdkmanager --include_obsolete \
36
36
"--sdk_root=${ANDROID_HOME}" \
37
37
"platform-tools" \
38
38
"build-tools;28.0.3" \
@@ -50,8 +50,10 @@ RUN set -eu \
50
50
"platforms;android-28" \
51
51
"extras;android;m2repository" \
52
52
"extras;google;m2repository" \
53
- "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2" \
54
53
"cmake;3.10.2.4988404" \
55
54
&& rm -rf "${ANDROID_HOME}/licenses"
56
55
56
+ # Accept all Android SDK licenses
57
+ RUN yes | tools/bin/sdkmanager "--sdk_root=${ANDROID_HOME}" --licenses
58
+
57
59
WORKDIR /src
You can’t perform that action at this time.
0 commit comments