From ae2d86651f17a299a35ee5f694cbf20d75358c37 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 14 Sep 2020 17:52:11 +0800 Subject: [PATCH] ignore check version if only change package yaml --- src/ac/acl/spec/check_spec.py | 19 +++++++++++++++++++ src/ac/common/gitee_repo.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/ac/acl/spec/check_spec.py b/src/ac/acl/spec/check_spec.py index 3443b05..e0fb208 100644 --- a/src/ac/acl/spec/check_spec.py +++ b/src/ac/acl/spec/check_spec.py @@ -27,11 +27,30 @@ class CheckSpec(BaseCheck): self._spec = RPMSpecAdapter(fp) self._latest_commit = self._gp.commit_id_of_reverse_head_index(0) + def _only_change_package_yaml(self): + """ + 如果本次提交只变更yaml,则无需检查version + :return: boolean + """ + diff_files = self._gp.diff_files_between_commits("HEAD~1", "HEAD~0") + package_yaml = "{}.yaml".format(self._repo) # package yaml file name + + if len(diff_files) == 1 and diff_files[0] == package_yaml: + logger.debug("diff files: {}".format(diff_files)) + return True + + return False + def check_version(self): """ 检查当前版本号是否比上一个commit新 :return: """ + # need check version? + if self._only_change_package_yaml(): + logger.debug("only change package yaml") + return SUCCESS + self._gp.checkout_to_commit("HEAD~1") try: gr = GiteeRepo(self._repo, self._work_dir, None) # don't care about decompress diff --git a/src/ac/common/gitee_repo.py b/src/ac/common/gitee_repo.py index 42c61a3..4d3c96a 100644 --- a/src/ac/common/gitee_repo.py +++ b/src/ac/common/gitee_repo.py @@ -48,7 +48,7 @@ class GiteeRepo(object): maybe multi spec file of repo :return: """ - if spec_files: # closure + if not spec_files: # closure logger.warning("no spec file") return None -- Gitee