linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-29 04:53:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci(deps): use resolved tag when syncing dependencies (#13764)

Browse source 
Co-authored-by: Carlo Sala <carlosalag@protonmail.com>
This commit is contained in:
Minh Vu 2026-05-28 19:04:07 +02:00 • committed by GitHub
commit 5ddb7fedcc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/dependencies/updater.py vendored
View file

@ -219,6 +219,7 @@ class Dependency:
if status["has_updates"] is True: if status["has_updates"] is True:
short_sha = status["head_ref"][:8] short_sha = status["head_ref"][:8]
new_version = status["version"] if is_tag else short_sha new_version = status["version"] if is_tag else short_sha
source_ref = new_version if is_tag else status["head_ref"]
try: try:
branch_name = f"update/{self.path}/{new_version}" branch_name = f"update/{self.path}/{new_version}"
@ -227,7 +228,7 @@ class Dependency:
branch = Git.checkout_or_create_branch(branch_name) branch = Git.checkout_or_create_branch(branch_name)
# Update dependency files # Update dependency files
self.__apply_upstream_changes() self.__apply_upstream_changes(source_ref)
if not Git.repo_is_clean(): if not Git.repo_is_clean():
# Update dependencies.yml file # Update dependencies.yml file
@ -297,7 +298,7 @@ Check out the [list of changes]({status["compare_url"]}).
dep_yaml = DependencyStore.update_dependency_version(self.path, new_version) dep_yaml = DependencyStore.update_dependency_version(self.path, new_version)
DependencyStore.write_store(DEPS_YAML_FILE, dep_yaml) DependencyStore.write_store(DEPS_YAML_FILE, dep_yaml)
def __apply_upstream_changes(self) -> None: def __apply_upstream_changes(self, ref: str) -> None:
# Patterns to ignore in copying files from upstream repo # Patterns to ignore in copying files from upstream repo
GLOBAL_IGNORE = [".git", ".github", ".gitignore"] GLOBAL_IGNORE = [".git", ".github", ".gitignore"]
@ -306,12 +307,11 @@ Check out the [list of changes]({status["compare_url"]}).
postcopy = self.values.get("postcopy") postcopy = self.values.get("postcopy")
repo = self.values["repo"] repo = self.values["repo"]
branch = self.values["branch"]
remote_url = f"https://github.com/{repo}.git" remote_url = f"https://github.com/{repo}.git"
repo_dir = os.path.join(TMP_DIR, repo) repo_dir = os.path.join(TMP_DIR, repo)
# Clone repository # Clone repository
Git.clone(remote_url, branch, repo_dir, reclone=True) Git.clone(remote_url, ref, repo_dir, reclone=True)
# Run precopy on tmp repo # Run precopy on tmp repo
if precopy is not None: if precopy is not None: