Skip to content

Commit

Permalink
Use correct git ref to identify most recent tag (#2321)
Browse files Browse the repository at this point in the history
Use correct git ref to identify most recent tag

With Copr builds, SRPMs are built in Copr using a custom script. Pass correct merged_ref to create_source_script().
Related to packit/packit#2184.
Merge after packit/packit#2215.

Reviewed-by: Laura Barcziová
  • Loading branch information
softwarefactory-project-zuul[bot] authored Jan 25, 2024
2 parents d4377bb + 17a05c6 commit 5257ccd
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions packit_service/worker/helpers/build/copr_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,20 @@ def run_copr_build_from_source_script(self) -> TaskResults:
group = self._get_or_create_build_group()
try:
pr_id = self.metadata.pr_id

# use correct git ref to identify most recent tag
if self.job_config.trigger == JobConfigTriggerType.pull_request:
merged_ref = self.project.get_pr(pr_id).target_branch
elif self.job_config.trigger == JobConfigTriggerType.commit:
merged_ref = self.metadata.commit_sha
elif self.job_config.trigger == JobConfigTriggerType.release:
merged_ref = self.metadata.tag_name
else:
logger.warning(
f"Unable to determine merged ref for {self.job_config.trigger}"
)
merged_ref = None

script = create_source_script(
url=self.metadata.project_url,
ref=self.metadata.git_ref,
Expand All @@ -477,6 +491,7 @@ def run_copr_build_from_source_script(self) -> TaskResults:
update_release=self.job_config.trigger != JobConfigTriggerType.release,
release_suffix=self.job_config.release_suffix,
package=self.job_config.package,
merged_ref=merged_ref,
)
build_id, web_url = self.submit_copr_build(script=script)
except Exception as ex:
Expand Down

0 comments on commit 5257ccd

Please sign in to comment.