Skip to content

Commit 8b3ee7d

Browse files
authored
Get previous commit when push on master (DataDog#21536)
* Take previous commit when merge base is the same commit * changelog
1 parent 33a9714 commit 8b3ee7d

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

ddev/changelog.d/21536.fixed

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixed retrieval of previous dependency size calculations so they can be used in CI runs on pushes to master.

ddev/src/ddev/cli/size/utils/common_funcs.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -964,9 +964,13 @@ def get_last_dependency_sizes_artifact(
964964
'''
965965
dep_sizes_json = get_dep_sizes_json(commit, platform, py_version)
966966
if not dep_sizes_json:
967-
dep_sizes_json = get_previous_dep_sizes(
968-
app.repo.git.merge_base(commit, "origin/master"), platform, py_version, compressed
969-
)
967+
base_commit = app.repo.git.merge_base(commit, "origin/master")
968+
if base_commit != commit:
969+
previous_commit = base_commit
970+
else:
971+
previous_commit = app.repo.git.log(["hash:%H"], n=2, source=commit)[1]["hash"]
972+
973+
dep_sizes_json = get_previous_dep_sizes(previous_commit, platform, py_version, compressed)
970974
return Path(dep_sizes_json) if dep_sizes_json else None
971975

972976

0 commit comments

Comments
 (0)