Skip to content

Commit 2099aee

Browse files
author
DravinceG16
committed
v1054,update: push to git server
1 parent afc88bd commit 2099aee

4 files changed

Lines changed: 40 additions & 2 deletions

File tree

Embedded_Firmware_Manager.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ exe = EXE(
3131
a.zipfiles,
3232
a.datas,
3333
[],
34-
name='Embedded_Firmware_Manager_v1.0.5.3',
34+
name='Embedded_Firmware_Manager_v1.0.5.4',
3535
debug=False,
3636
bootloader_ignore_signals=False,
3737
strip=False,

git_manager.py

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,36 @@ def get_recent_commits(self, count: int = 5) -> List[dict]:
292292
logger.error(f"获取提交记录失败: {e}")
293293

294294
return commits
295+
296+
def push_changes(self) -> bool:
297+
"""
298+
推送当前分支到远程仓库(依赖用户已设置好默认上游分支)
299+
300+
Returns:
301+
bool: 推送是否成功
302+
"""
303+
try:
304+
kwargs = self._get_subprocess_kwargs()
305+
kwargs['cwd'] = self.repo_path
306+
kwargs['timeout'] = 60
307+
308+
result = subprocess.run(
309+
['git', 'push'],
310+
**kwargs
311+
)
312+
313+
if result.returncode == 0:
314+
logger.info("Git推送成功")
315+
return True
316+
317+
logger.error(f"Git推送失败: {result.stderr}")
318+
return False
319+
except subprocess.TimeoutExpired:
320+
logger.error("Git推送超时")
321+
return False
322+
except Exception as e:
323+
logger.error(f"Git推送异常: {e}")
324+
return False
295325

296326

297327
def test_git_manager():

main.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,6 +1431,10 @@ def build_thread():
14311431
self.log_message(f"准备提交: {commit_message}")
14321432
if self.git_manager.commit_changes(commit_message):
14331433
self.log_message(f"Git提交成功: {commit_message}")
1434+
if self.git_manager.push_changes():
1435+
self.log_message("Git推送成功")
1436+
else:
1437+
self.log_message("Git推送失败,请手动检查")
14341438
else:
14351439
self.log_message("Git提交失败,但继续编译流程")
14361440
else:
@@ -1467,6 +1471,10 @@ def build_thread():
14671471
self.log_message(f"准备提交: {commit_message}")
14681472
if self.git_manager.commit_changes(commit_message):
14691473
self.log_message(f"Git提交成功: {commit_message}")
1474+
if self.git_manager.push_changes():
1475+
self.log_message("Git推送成功")
1476+
else:
1477+
self.log_message("Git推送失败,请手动检查")
14701478
else:
14711479
self.log_message("Git提交失败,但继续编译流程")
14721480

version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
# 工具版本号
99
# 格式:四位十进制数,每个位的范围是0-9
1010
# 例如:1.2.3.4 表示版本 1.2.3.4
11-
VERSION = "1.0.5.3"
11+
VERSION = "1.0.5.4"

0 commit comments

Comments
 (0)