From cf514fbbb7910610383bbbaf46ac001c6ff9f03c Mon Sep 17 00:00:00 2001 From: xiaoqidun Date: Wed, 13 Mar 2024 16:05:37 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=8D=87=E7=BA=A7=E9=95=9C=E5=83=8F):=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0Go=E5=92=8CNDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 6 +++--- DockerfileCN | 6 +++--- DockerfileHK | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7b73c16..321618c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,9 +11,9 @@ steps: commands: - sed -i "s|deb.debian.org|mirrors.ustc.edu.cn|g" /etc/apt/sources.list.d/debian.sources - apt-get update && apt-get install -y wget unzip && rm -rf /var/lib/apt/lists/* - - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26b-linux.zip - - unzip -q android-ndk-r26b-linux.zip - - rm -f android-ndk-r26b-linux.zip + - wget -q -T 180 -4 https://dl.google.com/android/repository/android-ndk-r26c-linux.zip + - unzip -q android-ndk-r26c-linux.zip + - rm -f android-ndk-r26c-linux.zip - name: docker-cn pull: if-not-exists image: plugins/docker diff --git a/DockerfileCN b/DockerfileCN index 160695b..c317dc8 100644 --- a/DockerfileCN +++ b/DockerfileCN @@ -1,5 +1,5 @@ # 基础镜像 -FROM golang:1.22.0-bookworm +FROM golang:1.22.1-bookworm # 作者信息 LABEL MAINTAINER="xiaoqidun@gmail.com" @@ -14,9 +14,9 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # 安装android ndk -COPY android-ndk-r26b /usr/local/android-ndk-r26b +COPY android-ndk-r26c /usr/local/android-ndk-r26c # 环境变量 -ENV PATH=$PATH:/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin +ENV PATH=$PATH:/usr/local/android-ndk-r26c/toolchains/llvm/prebuilt/linux-x86_64/bin ENV GO111MODULE=on ENV GOPROXY=https://goproxy.cn,direct diff --git a/DockerfileHK b/DockerfileHK index 06a74ba..90095e8 100644 --- a/DockerfileHK +++ b/DockerfileHK @@ -1,5 +1,5 @@ # 基础镜像 -FROM golang:1.22.0-bookworm +FROM golang:1.22.1-bookworm # 作者信息 LABEL MAINTAINER="xiaoqidun@gmail.com" @@ -11,9 +11,9 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* # 安装android ndk -COPY android-ndk-r26b /usr/local/android-ndk-r26b +COPY android-ndk-r26c /usr/local/android-ndk-r26c # 环境变量 -ENV PATH=$PATH:/usr/local/android-ndk-r26b/toolchains/llvm/prebuilt/linux-x86_64/bin +ENV PATH=$PATH:/usr/local/android-ndk-r26c/toolchains/llvm/prebuilt/linux-x86_64/bin ENV GO111MODULE=on ENV GOPROXY=https://goproxy.aite.xyz,direct