ci: flutter build 前显式 pub get + 重试(防 pub.flutter-io.cn 被 GFW 抖断)

iOS build 曾因 flutter build 内隐式 pub get 拉 google_fonts 时 pub.flutter-io.cn
socket error(exit 69)而失败。_env.sh 加 flutter_pub_get_retry(5 次重试),四个
compile 脚本在 flutter build 前显式预取,成功后 build 命中缓存不再拉网,减少偶发
网络失败。

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_013nMthbVEmQquxBRKb9Fj8u

.gitea/workflows/deploy-client.yml

@@ -34,7 +34,7 @@ concurrency:
 
 jobs:
   build-android:
-    runs-on: mac
+    runs-on: nas
     env:
       GOPROXY: https://goproxy.cn,direct
       PUB_HOSTED_URL: https://pub.flutter-io.cn
@@ -98,7 +98,7 @@ jobs:
   #      simply picks up whatever artifacts DO exist — an absent "macos"
   #      artifact is not an error there.
   build-macos:
-    runs-on: mac
+    runs-on: nas
     continue-on-error: true
     env:
       PUB_HOSTED_URL: https://pub.flutter-io.cn
@@ -129,7 +129,7 @@ jobs:
           path: dist/
 
   build-ios:
-    runs-on: mac
+    runs-on: nas
     continue-on-error: true
     env:
       PUB_HOSTED_URL: https://pub.flutter-io.cn
@@ -160,7 +160,7 @@ jobs:
   # (对应平台下载保留 pangolin1 上一版,待可用时下个 client-v* 追上)。
   release-deploy:
     needs: [build-android]
-    runs-on: mac
+    runs-on: nas
     steps:
       - name: Checkout
         uses: actions/checkout@v4

client/lib/l10n/app_text.dart

@@ -308,6 +308,24 @@ extension AppLangMisc on AppLang {
         return 'Cancelar';
     }
   }
+
+  /// 更新 banner:「立即更新」。
+  String get updateNow {
+    switch (this) {
+      case AppLang.zh:
+        return '立即更新';
+      case AppLang.en:
+        return 'Update now';
+      case AppLang.ja:
+        return '今すぐ更新';
+      case AppLang.ko:
+        return '지금 업데이트';
+      case AppLang.ru:
+        return 'Обновить';
+      case AppLang.es:
+        return 'Actualizar';
+    }
+  }
 }
 
 /// 全部界面文案的抽象契约。zh / en 各实现一份。

client/lib/screens/settings_page.dart

@@ -15,10 +15,8 @@ import '../state/settings_provider.dart';
 import '../state/update_provider.dart';
 import '../widgets/pangolin_icons.dart';
 import '../widgets/pangolin_toast.dart';
-import '../widgets/update_dialog.dart';
-
 /// 「检查更新」手动触发:拉取 `$kApiBaseUrl/version`,失败/无更新走轻提示,
-/// 有更新则弹 [showUpdateDialog]。
+/// 有更新则清掉「已忽略版本」→ 顶部更新 banner 显示 + toast(不弹窗)。
 Future<void> _checkForUpdate(BuildContext context, WidgetRef ref, AppText t) async {
   final info = await ref.read(updateProvider.notifier).forceCheck();
   if (!context.mounted) return;
@@ -30,7 +28,10 @@ Future<void> _checkForUpdate(BuildContext context, WidgetRef ref, AppText t) asy
     showPangolinToast(context, t.updateUpToDate);
     return;
   }
-  await showUpdateDialog(context, t, info);
+  // 有更新:清掉「已忽略版本」→ 顶部 banner 重新显示(不弹窗);toast 提示一下。
+  // 强制更新由 home_shell 的 listen 走不可关闭弹窗,这里无需处理。
+  ref.read(dismissedUpdateVersionProvider.notifier).state = null;
+  showPangolinToast(context, t.updateAvailableTitle(info.latestVersion));
 }
 
 class SettingsPage extends ConsumerWidget {

client/lib/shell/home_shell.dart

@@ -22,27 +22,36 @@ class HomeShell extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final c = context.pangolin;
 
-    // 启动自动检查更新:watch 惰性拉起 updateProvider(延迟 3s→查→1h 轮询);
-    // 有新版且本次会话未忽略时弹更新对话框。非强制更新弹前即标 dismiss,避免
-    // rebuild 重复弹(下轮轮询会重置);强制更新走不可关闭弹窗。
+    // 启动自动检查更新:watch 惰性拉起 updateProvider(延迟 3s→查→1h 轮询)。
+    // 非强制更新 → 顶部 banner(见下,不打断);强制更新 → 不可关闭弹窗。
     ref.listen<AsyncValue<AppUpdateInfo?>>(updateProvider, (prev, next) {
       final info = next.valueOrNull;
-      if (info == null || !info.hasUpdate) return;
-      final notifier = ref.read(updateProvider.notifier);
-      if (notifier.isDismissed) return;
-      if (!info.forceUpdate) notifier.dismiss();
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        if (!context.mounted) return;
-        showUpdateDialog(context, ref.read(appTextProvider), info);
-      });
+      if (info != null && info.hasUpdate && info.forceUpdate) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          if (context.mounted) {
+            showUpdateDialog(context, ref.read(appTextProvider), info);
+          }
+        });
+      }
     });
-    ref.watch(updateProvider); // 激活 provider(惰性 build)
+
+    final info = ref.watch(updateProvider).valueOrNull;
+    final dismissedVer = ref.watch(dismissedUpdateVersionProvider);
+    final showBanner = info != null &&
+        info.hasUpdate &&
+        !info.forceUpdate &&
+        dismissedVer != info.latestVersion;
 
     final Widget body = switch (context.formFactor) {
       FormFactor.desktop => const DesktopShell(),
       FormFactor.tablet => const TabletShell(),
       FormFactor.mobile => const MobileShell(),
     };
-    return Scaffold(backgroundColor: c.bg, body: body);
+    return Scaffold(
+      backgroundColor: c.bg,
+      body: showBanner
+          ? Column(children: [UpdateBanner(info: info), Expanded(child: body)])
+          : body,
+    );
   }
 }

client/lib/state/update_provider.dart

@@ -47,10 +47,6 @@ class AppUpdateInfo {
 /// 更新检查 Notifier。build() 惰性触发:延迟首查 + 每小时轮询。
 class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
   Timer? _timer;
-  bool _dismissed = false;
-
-  /// 本次会话是否已被用户「稍后」忽略(强制更新不看这个)。
-  bool get isDismissed => _dismissed;
 
   @override
   Future<AppUpdateInfo?> build() async {
@@ -58,18 +54,13 @@ class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
     await Future<void>.delayed(_kInitialDelay);
     final first = await _check();
     _timer = Timer.periodic(_kPollInterval, (_) async {
-      _dismissed = false; // 新一轮允许再次提示
       state = AsyncValue.data(await _check());
     });
     return first;
   }
 
-  /// 用户点「稍后」——本次会话内不再自动弹(直到下轮轮询)。
-  void dismiss() => _dismissed = true;
-
-  /// 设置页「检查更新」手动触发:立即查一次并回结果(不受 dismiss 影响)。
+  /// 设置页「检查更新」手动触发:立即查一次并回结果。
   Future<AppUpdateInfo?> forceCheck() async {
-    _dismissed = false;
     final info = await _check();
     state = AsyncValue.data(info);
     return info;
@@ -133,6 +124,11 @@ class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
 final updateProvider =
     AsyncNotifierProvider<UpdateNotifier, AppUpdateInfo?>(UpdateNotifier.new);
 
+/// 用户在更新 banner 点「稍后再说」时忽略的版本号。忽略后 banner 隐藏;出现号
+/// 不同的更新版本会重新显示;设置页手动「检查更新」会清空以重新提示。响应式,
+/// 供 shell 顶部 banner 的显隐判断。
+final dismissedUpdateVersionProvider = StateProvider<String?>((ref) => null);
+
 /// 按当前平台从服务端 download_urls 里取对应下载直链。
 String? platformDownloadUrl(Map<String, String> downloadUrls) {
   if (Platform.isMacOS) return downloadUrls['macos'];

client/lib/widgets/update_dialog.dart

@@ -6,10 +6,12 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 import '../core/update/app_updater.dart';
 import '../l10n/app_text.dart';
 import '../pangolin_theme.dart';
+import '../state/app_providers.dart';
 import '../state/update_provider.dart';
 import 'pangolin_icons.dart';
 
@@ -78,3 +80,60 @@ class _UpdateDialog extends StatelessWidget {
     );
   }
 }
+
+/// jiu 式顶部更新横条(非强制更新用;强制更新仍走不可关闭弹窗 showUpdateDialog)。
+/// 「立即更新」App 内下载安装;「×」忽略此版本(banner 隐藏,更新版本会重现)。
+class UpdateBanner extends ConsumerWidget {
+  const UpdateBanner({super.key, required this.info});
+  final AppUpdateInfo info;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final c = context.pangolin;
+    final t = ref.watch(appTextProvider);
+    return Material(
+      color: c.accentSubtle,
+      child: SafeArea(
+        bottom: false,
+        child: Padding(
+          padding: const EdgeInsets.fromLTRB(14, 8, 6, 8),
+          child: Row(children: [
+            Icon(PangolinIcons.zap, size: 17, color: c.accent),
+            const SizedBox(width: 10),
+            Expanded(
+              child: Text(
+                t.updateAvailableTitle(info.latestVersion),
+                style: PangolinText.sm.copyWith(color: c.fg1, fontWeight: FontWeight.w700),
+                overflow: TextOverflow.ellipsis,
+              ),
+            ),
+            const SizedBox(width: 8),
+            TextButton(
+              onPressed: () => unawaited(startInAppUpdate(context, t, info)),
+              style: TextButton.styleFrom(
+                backgroundColor: c.accent,
+                foregroundColor: c.fgOnAccent,
+                padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 6),
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(PangolinRadius.full)),
+                minimumSize: Size.zero,
+                tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+              ),
+              child: Text(t.lang.updateNow,
+                  style: PangolinText.caption
+                      .copyWith(fontWeight: FontWeight.w700, fontSize: 12.5)),
+            ),
+            IconButton(
+              onPressed: () =>
+                  ref.read(dismissedUpdateVersionProvider.notifier).state = info.latestVersion,
+              icon: Icon(Icons.close, size: 18, color: c.fg3),
+              padding: EdgeInsets.zero,
+              constraints: const BoxConstraints(minWidth: 36, minHeight: 36),
+              tooltip: t.updateLater,
+            ),
+          ]),
+        ),
+      ),
+    );
+  }
+}

scripts/ci/_env.sh

@@ -29,3 +29,18 @@ ver_from_tag() {
   ref="${ref#"${prefix}"-v}"
   printf '%s' "$ref"
 }
+
+# flutter_pub_get_retry — pub.flutter-io.cn 常被 GFW 抖断(socket error / exit 69),
+# 让 flutter build 内隐式的 pub get 偶发失败(见 iOS build 曾因 google_fonts 拉包
+# 断线而挂)。构建前显式预取 + 重试;成功后 build 命中缓存不再拉网。在 flutter
+# 项目根目录调用。
+flutter_pub_get_retry() {
+  local i
+  for i in 1 2 3 4 5; do
+    if flutter pub get; then return 0; fi
+    echo "==> flutter pub get 失败(第 ${i}/5 次,pub.flutter-io.cn 抖?),8s 后重试..." >&2
+    sleep 8
+  done
+  echo "==> flutter pub get 5 次仍失败,放弃" >&2
+  return 1
+}

scripts/ci/compile-android.sh

@@ -131,6 +131,7 @@ EOF
 # 现代绝大多数 Android 机)作为唯一下载,约 ~80MB;32 位老机(armeabi-v7a)/模拟器
 # (x86_64)本轮不分发(需要再加)。这样官网 + deploy-client 仍是单一稳定 URL。
 cd client
+flutter_pub_get_retry # 预取包 + 重试,防 pub.flutter-io.cn 被 GFW 抖断(见 _env.sh)
 flutter build apk --release --split-per-abi \
   "--dart-define=PANGOLIN_API_URL=${API_URL}"
 cd ..

scripts/ci/compile-ios.sh

@@ -173,6 +173,7 @@ EOF
 
 # ── [6/6] flutter build ipa + 上传 TestFlight ───────────────────────────────
 cd "${REPO_ROOT}/client"
+flutter_pub_get_retry # 预取包 + 重试,防 pub.flutter-io.cn 被 GFW 抖断(见 _env.sh)
 flutter build ipa --release \
   --build-name="${VER}" \
   --build-number="${BUILD}" \

scripts/ci/compile-macos.sh

@@ -182,6 +182,7 @@ echo "==> compile-macos: signing identity '${IDENTITY}'"
 # 明），本步应已产出 Developer ID 签名 + hardened runtime 的 .app；下一步的
 # inside-out 重签是幂等的安全网，不依赖这一步是否已经"恰好签对"。
 cd "${REPO_ROOT}/client"
+flutter_pub_get_retry # 预取包 + 重试,防 pub.flutter-io.cn 被 GFW 抖断(见 _env.sh)
 flutter build macos --release --dart-define="PANGOLIN_API_URL=${API_URL}"
 cd "$REPO_ROOT"
 

scripts/ci/compile-windows.sh

@@ -51,7 +51,15 @@ VER=""
 read -r VER < "$ver_file" || true  # 无结尾换行的 read 退出码,见 compile-android.sh 同注释
 rm -f "$ver_file"
 
-echo "==> compile-windows: tag=${TAG} version=${VER}"
+# build number 同 android/macos 规则(MAJOR*10000+MINOR*100+PATCH)。
+MAJOR="${VER%%.*}"
+_REST="${VER#*.}"
+MINOR="${_REST%%.*}"
+PATCH="${_REST#*.}"
+PATCH="${PATCH%%-*}"
+BUILD=$(( MAJOR * 10000 + MINOR * 100 + PATCH ))
+
+echo "==> compile-windows: tag=${TAG} version=${VER} build=${BUILD}"
 
 API_URL="${PANGOLIN_API_URL:-https://api.yanmeiai.com}"
 
@@ -79,6 +87,12 @@ rm -rf "${BUILD_CLIENT}/windows/flutter/ephemeral" \
        "${BUILD_CLIENT}/.dart_tool" \
        "${BUILD_CLIENT}/build"
 
+# 同步 Flutter app 版本到 tag(GNU sed,windows runner)。否则 package_info 卡在
+# pubspec committed 值(1.0.48),设置页显示旧版 + 自动更新永远判"有新版"。
+# 此前只改了 Inno 安装器 MyAppVersion(下方),App 内部版本没跟上——本次修复。
+sed -i "s/^version:.*/version: ${VER}+${BUILD}/" "${BUILD_CLIENT}/pubspec.yaml"
+echo "==> compile-windows: pubspec version -> ${VER}+${BUILD}"
+
 # ── [3/4] build ──────────────────────────────────────────────────────────────
 # NOTE(controller): `flutter create` on an existing project only fills in
 # scaffolding it manages (ephemeral/, generated_plugins.cmake, ...) and should
@@ -89,6 +103,7 @@ rm -rf "${BUILD_CLIENT}/windows/flutter/ephemeral" \
 # on first real CI run that none of those get clobbered.
 pushd "$BUILD_CLIENT" > /dev/null
 flutter create --platforms=windows . --project-name pangolin_vpn
+flutter_pub_get_retry # 预取包 + 重试,防 pub.flutter-io.cn 被 GFW 抖断(见 _env.sh)
 flutter build windows --release "--dart-define=PANGOLIN_API_URL=${API_URL}"
 popd > /dev/null