Skip to content

Fix subdirectory tagging #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christopher-dG merged 2 commits into from
Sep 18, 2023
Merged

Fix subdirectory tagging #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12235cd
Fix subdirectory tagging
sloede Sep 13, 2023
8eac8a3
Fix line length
sloede Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,12 @@ with:

Version tags will then be prefixed with the subpackage's name: `{PACKAGE}-v{VERSION}`, e.g., `SubpackageName-v0.2.3`. (For top-level packages, the default tag is simply `v{VERSION}`.)

**Note**: Using TagBot with a non-empty `subdir` will only work for Julia package versions
registered using the official
[Registrator](https://github.com/JuliaRegistries/Registrator.jl) (see also
[#281](https://github.com/JuliaRegistries/TagBot/issues/281) and
[#282](https://github.com/JuliaRegistries/TagBot/pull/282)).

To tag releases from a monorepo containing multiple subpackages and an optional top-level package, set up a separate step for each package you want to tag. For example, to tag all three packages in the following repository,

```
Expand Down
12 changes: 12 additions & 0 deletions tagbot/action/repo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,18 @@ def _commit_sha_from_registry_pr(self, version: str, tree: str) -> Optional[str]
logger.info("Registry PR body did not match")
return None
commit = self._repo.get_commit(m[1])
# Handle special case of tagging packages in a repo subdirectory, in which
# case the Julia package tree hash does not match the git commit tree hash
if self.__subdir:
arg = f"{commit.sha}:{self.__subdir}"
subdir_tree_hash = self._git.command("rev-parse", arg)
if subdir_tree_hash == tree:
return commit.sha
else:
msg = "Subdir tree SHA of commit from registry PR does not match"
logger.warning(msg)
return None
# Handle regular case (subdir is not set)
if commit.commit.tree.sha == tree:
return commit.sha
else:
Expand Down