2624 Commits

Author SHA1 Message Date
194d7d96e6 Merge branch 'develop_sky' into 'master_sky'
fix:增加android构建日志,避免并发构建

See merge request StarlockTeam/app-starlock!86
sky_v1.6.685
2025-05-17 06:45:37 +00:00
03c24b3c97 fix:增加android构建日志,避免并发构建 2025-05-17 14:44:46 +08:00
c4d06dbb36 Merge branch 'develop_sky' into 'master_sky'
fix:增加android构建日志

See merge request StarlockTeam/app-starlock!85
sky_v1.6.683
2025-05-17 06:01:57 +00:00
7dde0cdf8e fix:增加android构建日志 2025-05-17 14:00:46 +08:00
b2b5b6b886 Merge branch 'develop_sky' into 'master_sky'
fix:调整镜像源

See merge request StarlockTeam/app-starlock!84
sky_v1.6.681
2025-05-17 03:44:53 +00:00
aa6f01ad5c fix:调整镜像源 2025-05-17 11:42:23 +08:00
2cf76ae656 Merge branch 'develop_sky' into 'master_sky'
fix:调整ci

See merge request StarlockTeam/app-starlock!83
sky_v1.6.679
2025-05-17 03:23:39 +00:00
1ee2ca5a54 fix:调整ci 2025-05-17 11:22:56 +08:00
e056f08bd9 Merge branch 'develop_sky' into 'master_sky'
fix:调整ci

See merge request StarlockTeam/app-starlock!82
2025-05-17 02:44:05 +00:00
804cdba152 fix:调整ci 2025-05-17 10:42:19 +08:00
acf25e2c75 Merge branch 'develop_sky' into 'master_sky'
fix:调整ci

See merge request StarlockTeam/app-starlock!81
sky_v1.6.675
2025-05-17 02:18:24 +00:00
46bec40eb7 fix:调整ci 2025-05-17 10:17:43 +08:00
dbf53273a8 Merge branch 'develop_sky' into 'master_sky'
fix:调整ci

See merge request StarlockTeam/app-starlock!80
sky_v1.6.673
2025-05-17 01:29:23 +00:00
f42659c8ac fix:调整ci 2025-05-17 09:28:28 +08:00
1939af9322 Merge branch 'develop_sky' into 'master_sky'
fix:调整不根据tag昵称进行区分构建

See merge request StarlockTeam/app-starlock!79
sky_v1.6.671
2025-05-16 10:47:29 +00:00
c1c4a4a675 fix:调整不根据tag昵称进行区分构建 2025-05-16 18:46:45 +08:00
7716f8b33e Merge branch 'develop_sky' into 'master_sky'
fix:调整出现Could not find的问题,显式指定

See merge request StarlockTeam/app-starlock!78
sky_v1.6.669
2025-05-16 10:25:46 +00:00
219e0e794f fix:调整出现Could not find的问题,显式指定 2025-05-16 18:24:58 +08:00
fd17554684 Merge branch 'develop_sky' into 'master_sky'
fix:调整出现Could not find的问题,显式指定

See merge request StarlockTeam/app-starlock!77
2025-05-16 10:18:53 +00:00
5ddfbe46d1 fix:调整出现Could not find的问题,显式指定 2025-05-16 18:18:10 +08:00
616c3d6eda Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!76
sky_v1.6.665
2025-05-16 10:03:32 +00:00
84b821b6eb Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整tag昵称判断规则

See merge request StarlockTeam/app-starlock!75
2025-05-16 10:01:56 +00:00
bed58065b0 fix:调整tag昵称判断规则 2025-05-16 18:01:08 +08:00
b1bf55a57a Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!74
sky_v1.6.663
2025-05-16 09:55:07 +00:00
8e92ac6ebb Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整source源让bundle_install_retry脚本管理

See merge request StarlockTeam/app-starlock!73
2025-05-16 09:53:47 +00:00
a44be677c5 fix:调整source源让bundle_install_retry脚本管理 2025-05-16 17:52:48 +08:00
0f8f6e62c9 Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!72
sky_v1.6.661
2025-05-16 09:41:14 +00:00
6863f20879 Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:调整tag触发构建的正则判断

See merge request StarlockTeam/app-starlock!71
2025-05-16 09:40:38 +00:00
e035d5105e fix:调整tag触发构建的正则判断 2025-05-16 17:39:53 +08:00
44e6a597bd Merge branch 'develop_sky' into 'master_sky'
fix:增加bundle install重试脚本

See merge request StarlockTeam/app-starlock!70
sky_v1.6.659
2025-05-16 09:28:12 +00:00
4c544a462e Merge branch 'develop_sky_liyi' into 'develop_sky'
fix:增加bundle install重试脚本

See merge request StarlockTeam/app-starlock!69
2025-05-16 09:27:12 +00:00
e809adf98f fix:增加bundle install重试脚本 2025-05-16 17:26:15 +08:00
fef7f3d9e7 Merge branch 'develop_sky' into 'master_sky'
Develop sky

See merge request StarlockTeam/app-starlock!68
sky_v1.6.656
2025-05-16 09:08:34 +00:00
a83d26e368 Merge branch 'develop_sky_liyi' into 'develop_sky'
Develop sky liyi

See merge request StarlockTeam/app-starlock!67
2025-05-16 09:07:58 +00:00
8e122e5a09 fix:增加出现混mjpeg期望数据的日志 2025-05-16 17:07:05 +08:00
7d4e257404 fix:调整开关静音时使用选择的清晰度作为期望数据发送 2025-05-16 17:06:49 +08:00
f98370a6ef Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!66
sky_v1.6.650
2025-05-16 08:45:57 +00:00
84ca900ddf fix:调整ci 2025-05-16 16:45:21 +08:00
bd12720b33 Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!65
2025-05-16 08:43:00 +00:00
faca7eae3e fix:调整ci 2025-05-16 16:39:49 +08:00
eed55cb920 Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!64
2025-05-16 08:26:25 +00:00
a053e23843 fix:调整ci 2025-05-16 16:25:38 +08:00
336915144a Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!63
2025-05-16 08:22:34 +00:00
448268ecc7 fix:调整ci 2025-05-16 16:21:41 +08:00
72f1bfbe61 Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!62
2025-05-16 08:03:37 +00:00
3201f839eb fix:调整ci 2025-05-16 16:00:39 +08:00
8f75c8805d Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!61
2025-05-16 07:44:15 +00:00
3ab1e5e451 fix:调整ci 2025-05-16 15:43:00 +08:00
8c17f506b7 Merge branch 'develop_sky_liyi' into 'canary_release'
fix:调整ci

See merge request StarlockTeam/app-starlock!60
2025-05-16 07:25:38 +00:00
ac0d8073ee fix:调整ci 2025-05-16 15:25:03 +08:00