From aa5d525deda327eeb472875b141232b59db029d4 Mon Sep 17 00:00:00 2001 From: xiaoqidun Date: Thu, 24 Dec 2020 15:27:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0NDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 25 +++++++++++-------------- Dockerfile | 4 ++-- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.drone.yml b/.drone.yml index 73abaf3..7c6d602 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,20 +11,17 @@ steps: - chmod +x build.sh - ./build.sh - name: upload - pull: if-not-exists - image: plugins/s3 + image: xiaoqidun/gocos settings: - bucket: - from_secret: minio_bucket - access_key: - from_secret: minio_access_key + secret_id: + from_secret: cos_secret_id secret_key: - from_secret: minio_secret_key - source: release/* - strip_prefix: release/ + from_secret: cos_secret_key + bucket_url: + from_secret: cos_bucket_url + source: release/ target: product/goenv - path_style: true - endpoint: https://minio.aite.xyz + strip_prefix: release/ --- kind: pipeline @@ -36,9 +33,9 @@ steps: pull: if-not-exists image: alpine commands: - - wget -q -T 180 https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip - - unzip -q android-ndk-r21d-linux-x86_64.zip - - rm -f 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-r22-linux-x86_64.zip + - rm -f android-ndk-r22-linux-x86_64.zip - name: docker pull: if-not-exists image: plugins/docker diff --git a/Dockerfile b/Dockerfile index b99168a..e47a7ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,9 @@ RUN apt-get update \ build-essential mingw-w64 upx-ucl # 安装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 GOPROXY=https://goproxy.aite.xyz,direct \ No newline at end of file