|
|
7105f16daa
|
Merge branch 'develop_sky' into 'canary_release_sky'
Develop sky
See merge request StarlockTeam/app-starlock!110
|
2025-05-30 06:16:20 +00:00 |
|
|
|
de73ffe64b
|
Merge branch 'develop_sky_testci' into 'develop_sky'
Develop sky testci
See merge request StarlockTeam/app-starlock!109
|
2025-05-30 06:01:30 +00:00 |
|
|
|
78ae2c3239
|
Merge remote-tracking branch 'origin/develop_sky' into develop_sky_testci
# Conflicts:
# .gitlab-ci.yml
# android/Gemfile.lock
# lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
|
2025-05-30 14:00:52 +08:00 |
|
|
|
34eabe7eee
|
fix:测试开发ci流程
|
2025-05-30 13:57:18 +08:00 |
|
|
|
2b29e510ce
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 13:50:48 +08:00 |
|
|
|
a94e80e670
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 13:48:19 +08:00 |
|
|
|
0e399c5831
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 12:34:35 +08:00 |
|
|
|
285211804b
|
fix:调整rbenv global版本，修复build_android失败问题
|
2025-05-30 12:29:36 +08:00 |
|
|
|
9af93869a8
|
fix:测试skyci流程
|
2025-05-30 12:19:58 +08:00 |
|
|
|
dac34b8824
|
fix:测试skyci流程
|
2025-05-30 11:49:54 +08:00 |
|
|
|
c26f241b2b
|
fix:测试skyci流程
|
2025-05-30 11:36:17 +08:00 |
|
|
|
5af587466c
|
fix:ci流程调整为sky分支构建
|
2025-05-30 11:34:03 +08:00 |
|
|
|
35f7dd38e3
|
fix:同步修复后的ci文件
|
2025-05-30 10:54:37 +08:00 |
|
Liuyf
|
5d0da71780
|
fix: 修复构建失败问题。
|
2025-05-26 14:15:27 +08:00 |
|
Liuyf
|
261a0363e5
|
fix: 修复构建失败问题。
|
2025-05-26 12:05:01 +08:00 |
|
Liuyf
|
09f75dbd4a
|
fix: 修复构建失败问题。
|
2025-05-26 11:57:28 +08:00 |
|
Liuyf
|
9f9c31862e
|
fix: 修复构建失败问题。
|
2025-05-26 11:55:16 +08:00 |
|
Liuyf
|
f770a11e68
|
fix: 修复构建失败问题
|
2025-05-26 11:23:35 +08:00 |
|
Liuyf
|
ab327e1a4f
|
fix: 修复构建失败问题
|
2025-05-23 19:20:41 +08:00 |
|
Liuyf
|
130cc8f133
|
fix: 修复构建失败问题
|
2025-05-23 19:02:47 +08:00 |
|
Liuyf
|
f938a17576
|
Merge branch 'release' into develop
|
2025-05-23 15:51:11 +08:00 |
|
Liuyf
|
08b8924937
|
Merge branch 'master' into release
|
2025-05-23 15:50:51 +08:00 |
|
|
|
0fffc2c4b2
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!96
|
2025-05-19 02:16:11 +00:00 |
|
|
|
092a0d00b7
|
fix:恢复原有ci
|
2025-05-19 10:13:30 +08:00 |
|
|
|
c6940e56cf
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!95
|
2025-05-19 01:25:31 +00:00 |
|
|
|
6a3992b8e2
|
fix:恢复原有ci
|
2025-05-19 09:23:21 +08:00 |
|
|
|
f4fd0668b0
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!94
|
2025-05-17 10:13:10 +00:00 |
|
|
|
0b5fb23eec
|
fix:恢复原有ci
|
2025-05-17 18:12:39 +08:00 |
|
|
|
ec80c224f8
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!93
|
2025-05-17 10:08:00 +00:00 |
|
|
|
cb48492f38
|
fix:恢复原有ci
|
2025-05-17 18:06:55 +08:00 |
|
|
|
1f0172f61f
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!92
|
2025-05-17 09:51:09 +00:00 |
|
|
|
d046167518
|
fix:恢复原有ci
|
2025-05-17 17:50:15 +08:00 |
|
|
|
b907028e26
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!91
|
2025-05-17 09:46:35 +00:00 |
|
|
|
eeff5f0665
|
fix:恢复原有ci
|
2025-05-17 17:45:53 +08:00 |
|
|
|
c26e2068b6
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!90
|
2025-05-17 09:37:40 +00:00 |
|
|
|
da85d65fa2
|
fix:恢复原有ci
|
2025-05-17 17:36:57 +08:00 |
|
|
|
d32529518e
|
Merge branch 'develop_sky' into 'canary_release'
fix:恢复原有ci
See merge request StarlockTeam/app-starlock!89
|
2025-05-17 09:11:06 +00:00 |
|
|
|
78ad994cc4
|
fix:恢复原有ci
|
2025-05-17 17:10:30 +08:00 |
|
|
|
fe955dd9bb
|
Merge branch 'develop_sky' into 'canary_release'
Develop sky
See merge request StarlockTeam/app-starlock!88
|
2025-05-17 08:33:25 +00:00 |
|
|
|
48603c7daa
|
fix:恢复原有ci
|
2025-05-17 16:32:39 +08:00 |
|
|
|
4787759694
|
fix:调整ci
|
2025-05-17 15:40:12 +08:00 |
|
|
|
de3722292e
|
fix:取消截图时必须接听的逻辑
|
2025-05-17 15:12:36 +08:00 |
|
|
|
9c4cea5224
|
fix:移除高德同时移除锁基本信息中的位置信息
|
2025-05-17 15:12:13 +08:00 |
|
|
|
03c24b3c97
|
fix:增加android构建日志，避免并发构建
|
2025-05-17 14:44:46 +08:00 |
|
|
|
7dde0cdf8e
|
fix:增加android构建日志
|
2025-05-17 14:00:46 +08:00 |
|
|
|
aa6f01ad5c
|
fix:调整镜像源
|
2025-05-17 11:42:23 +08:00 |
|
|
|
1ee2ca5a54
|
fix:调整ci
|
2025-05-17 11:22:56 +08:00 |
|
|
|
804cdba152
|
fix:调整ci
|
2025-05-17 10:42:19 +08:00 |
|
|
|
46bec40eb7
|
fix:调整ci
|
2025-05-17 10:17:43 +08:00 |
|
|
|
f42659c8ac
|
fix:调整ci
|
2025-05-17 09:28:28 +08:00 |
|
