feat(更新版本): 更新NDK

This commit is contained in:
xiaoqidun 2020-12-24 15:27:58 +08:00
parent 8a1aac3f9e
commit aa5d525ded
2 changed files with 13 additions and 16 deletions

@ -11,20 +11,17 @@ steps:
- chmod +x build.sh - chmod +x build.sh
- ./build.sh - ./build.sh
- name: upload - name: upload
pull: if-not-exists image: xiaoqidun/gocos
image: plugins/s3
settings: settings:
bucket: secret_id:
from_secret: minio_bucket from_secret: cos_secret_id
access_key:
from_secret: minio_access_key
secret_key: secret_key:
from_secret: minio_secret_key from_secret: cos_secret_key
source: release/* bucket_url:
strip_prefix: release/ from_secret: cos_bucket_url
source: release/
target: product/goenv target: product/goenv
path_style: true strip_prefix: release/
endpoint: https://minio.aite.xyz
--- ---
kind: pipeline kind: pipeline
@ -36,9 +33,9 @@ steps:
pull: if-not-exists pull: if-not-exists
image: alpine image: alpine
commands: commands:
- wget -q -T 180 https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip - wget -q -T 180 https://dl.google.com/android/repository/android-ndk-r22-linux-x86_64.zip
- unzip -q android-ndk-r21d-linux-x86_64.zip - unzip -q android-ndk-r22-linux-x86_64.zip
- rm -f android-ndk-r21d-linux-x86_64.zip - rm -f android-ndk-r22-linux-x86_64.zip
- name: docker - name: docker
pull: if-not-exists pull: if-not-exists
image: plugins/docker image: plugins/docker

@ -10,9 +10,9 @@ RUN apt-get update \
build-essential mingw-w64 upx-ucl build-essential mingw-w64 upx-ucl
# 安装android ndk # 安装android ndk
COPY android-ndk-r21d /usr/local/android-ndk-r21d COPY android-ndk-r22 /usr/local/android-ndk-r22
# 环境变量 # 环境变量
ENV PATH=$PATH:/usr/local/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/bin ENV PATH=$PATH:/usr/local/android-ndk-r22/toolchains/llvm/prebuilt/linux-x86_64/bin
ENV GO111MODULE=on ENV GO111MODULE=on
ENV GOPROXY=https://goproxy.aite.xyz,direct ENV GOPROXY=https://goproxy.aite.xyz,direct