Merge pull request #381 from openedx/iamsobanjaved/fix-deleted-file

fix: remove file from git tree when delete
openedx-unsupported · Aug 31, 2023 · 890a9c4 · 890a9c4
2 parents 3197db4 + f443f1e
commit 890a9c4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/jenkins/github_helpers.py b/jenkins/github_helpers.py
@@ -423,8 +423,12 @@ def update_list_of_files(self, repository, repo_root, file_path_list, commit_mes
         input_trees_list = []
         base_git_tree = repository.get_git_tree(sha)
         for file_path in file_path_list:
-            content = self.get_file_contents(repo_root, file_path)
-            input_tree = InputGitTreeElement(file_path, "100644", "blob", content=content)
+            if os.path.exists(os.path.join(repo_root, file_path)):
+                content = self.get_file_contents(repo_root, file_path)
+                input_tree = InputGitTreeElement(file_path, "100644", "blob", content=content)
+            else:
+                # Remove file from git tree as the file is removed
+                input_tree = InputGitTreeElement(file_path, "100644", "blob", sha=None)
             input_trees_list.append(input_tree)
         if len(input_trees_list) > 0:
             new_git_tree = repository.create_git_tree(input_trees_list, base_tree=base_git_tree)