From 2d18cbc9da26a78af14506c3e88a65a0ac89c5f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 20 Mar 2026 22:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20Sync=202026-03-20=2022:21:03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gn/Makefile | 6 +++--- gn/src/out/last_commit_position.h | 4 ++-- .../luci-static/resources/view/dockerman/configuration.js | 1 + .../root/etc/uci-defaults/luci-app-dockerman | 0 4 files changed, 6 insertions(+), 5 deletions(-) rename {applications/luci-app-dockerman => luci-app-dockerman}/root/etc/uci-defaults/luci-app-dockerman (100%) diff --git a/gn/Makefile b/gn/Makefile index ce25c2973..8198a4326 100644 --- a/gn/Makefile +++ b/gn/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gn -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git -PKG_SOURCE_DATE:=2025-11-07 -PKG_SOURCE_VERSION:=e7f3202128bdb2429872fdb138626a010b2bff7f +PKG_SOURCE_DATE:=2025-09-18 +PKG_SOURCE_VERSION:=81b24e01531ecf0eff12ec9359a555ec3944ec4e PKG_MIRROR_HASH:=skip PKG_LICENSE:=BSD 3-Clause diff --git a/gn/src/out/last_commit_position.h b/gn/src/out/last_commit_position.h index 92713e0f0..5e743be2e 100644 --- a/gn/src/out/last_commit_position.h +++ b/gn/src/out/last_commit_position.h @@ -3,7 +3,7 @@ #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ -#define LAST_COMMIT_POSITION_NUM 2292 -#define LAST_COMMIT_POSITION "2292 (e7f3202128bd)" +#define LAST_COMMIT_POSITION_NUM 2286 +#define LAST_COMMIT_POSITION "2286 (81b24e01531e)" #endif // OUT_LAST_COMMIT_POSITION_H_ diff --git a/luci-app-dockerman/htdocs/luci-static/resources/view/dockerman/configuration.js b/luci-app-dockerman/htdocs/luci-static/resources/view/dockerman/configuration.js index e2e30c5ac..73b3a619a 100644 --- a/luci-app-dockerman/htdocs/luci-static/resources/view/dockerman/configuration.js +++ b/luci-app-dockerman/htdocs/luci-static/resources/view/dockerman/configuration.js @@ -66,6 +66,7 @@ return L.view.extend({ o.value('https://docker.io'); o.value('https://ghcr.io'); o.value('https://hub-mirror.c.163.com'); + o.value('https://ustc-edu-cn.mirror.aliyuncs.com'); o = s.taboption('globals', form.ListValue, 'log_level', _('Log Level'), diff --git a/applications/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman b/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman similarity index 100% rename from applications/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman rename to luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman