Merge branch 'dev' into test

# Conflicts: # .gitea/workflows/ci.yaml
ci: ci test
2025-10-31 17:08:50 +08:00 · 2025-10-31 17:06:08 +08:00 · 2025-10-31 16:51:29 +08:00 · 2025-10-31 16:41:38 +08:00 · 2025-10-31 14:47:49 +08:00 · 2025-10-31 14:36:56 +08:00
1 changed files with 2 additions and 2 deletions
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
  build-and-deploy-dev:
    if: github.ref_name == 'test'
-    runs-on: docker
+    runs-on: gitea_act_runner
    container:
      image: node:24-alpine
    steps:
@@ -85,7 +85,7 @@ jobs:

  build-and-deploy-prod:
    if: github.ref_name == 'main'
-    runs-on: docker
+    runs-on: gitea_act_runner
    container:
      image: node:24-alpine
    steps:
Author	SHA1	Message	Date
YuanHuakk	0bb91567d9	Merge branch 'dev' into test All checks were successful CI Build & Deploy / build-and-deploy-dev (push) Successful in 32m55s Details CI Build & Deploy / build-and-deploy-prod (push) Has been skipped Details # Conflicts: # .gitea/workflows/ci.yaml	2025-10-31 17:08:50 +08:00
YuanHuakk	f8df513e10	ci: ci test	2025-10-31 17:06:08 +08:00
YuanHuakk	afbc4bac90	ci: test ci	2025-10-31 16:51:29 +08:00
YuanHuakk	77bfbf1982	ci: test ci All checks were successful continuous-integration/drone/push Build is passing Details	2025-10-31 16:41:38 +08:00
YuanHuakk	c3547feebd	build(deps): 依赖升级 All checks were successful continuous-integration/drone/push Build is passing Details	2025-10-31 14:47:49 +08:00
YuanHuakk	038f67ec2a	refactor: 活动订单id显示变更嘉联 All checks were successful continuous-integration/drone/push Build is passing Details	2025-10-31 14:36:56 +08:00
YuanHuakk	d754bd45c9	feat(custom): 多API版本 All checks were successful continuous-integration/drone/push Build is passing Details	2025-09-23 18:24:41 +08:00
YuanHuakk	0ff7154101	feat(custom): 订单列表支付方式筛选增加新条件	2025-05-29 15:33:18 +08:00
YuanHuakk	e0632136d7	mod(custom): \! All checks were successful continuous-integration/drone/push Build is passing Details	2024-10-05 04:22:55 +08:00