Skip to content
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.

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

Adding a describedVersion(...) for ConsoleGitReadableOnly #238

Merged
merged 1 commit into from
Sep 7, 2024

Conversation

blast-hardcheese
Copy link
Contributor

In monorepos (in this example guardrail), the same ref will occasionally have multiple tags.

Relying on git describe without --match could resolve the wrong tag for different modules.

Unfortunately JGit still does not support git worktree (though that seems to be coming soon!), so I'm stuck on CLI git.

Thank you

Copy link
Collaborator

@raboof raboof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In monorepos (in this example guardrail), the same ref will occasionally have multiple tags.

Relying on git describe without --match could resolve the wrong tag for different modules.

Nice. I noticed when testing that when there is a release version (v1.2.3) that will still take precedence over the 'described' version, which was surprising to me consistent with the JGit behavior.

Unfortunately JGit still does not support git worktree (though that seems to be coming soon!), so I'm stuck on CLI git.

I like your optimism ;)

blast-hardcheese added a commit to blast-hardcheese/guardrail that referenced this pull request Oct 30, 2023
See sbt/sbt-git#238. Until that is released, we need to use JGit for correct module versions.

See JGit:

    cli, Some(0.71.0-474-g55ddd1d-SNAPSHOT)
    core, Some(0.75.3-278-g55ddd1d-SNAPSHOT)
    java-async-http, Some(0.72.0-376-g55ddd1d-SNAPSHOT)
    java-dropwizard, Some(0.72.0-376-g55ddd1d-SNAPSHOT)
    java-spring-mvc, Some(0.71.2-367-g55ddd1d-SNAPSHOT)
    java-support, Some(0.73.1-367-g55ddd1d-SNAPSHOT)
    microsite, None
    scala-akka-http, Some(0.76.0-259-g55ddd1d-SNAPSHOT)
    scala-dropwizard, Some(0.72.0-376-g55ddd1d-SNAPSHOT)
    scala-http4s, Some(0.76.1-160-g55ddd1d-SNAPSHOT)
    scala-support, Some(0.75.3-261-g55ddd1d-SNAPSHOT)

vs console git:

    cli, Some(scala-http4s-v0.76.1-162-ge343b804)
    core, Some(scala-http4s-v0.76.1-162-ge343b804)
    java-async-http, Some(scala-http4s-v0.76.1-162-ge343b804)
    java-dropwizard, Some(scala-http4s-v0.76.1-162-ge343b804)
    java-spring-mvc, Some(scala-http4s-v0.76.1-162-ge343b804)
    java-support, Some(scala-http4s-v0.76.1-162-ge343b804)
    microsite, Some(scala-http4s-v0.76.1-162-ge343b804)
    scala-akka-http, Some(scala-http4s-v0.76.1-162-ge343b804)
    scala-dropwizard, Some(scala-http4s-v0.76.1-162-ge343b804)
    scala-http4s, Some(0.76.1-162-ge343b804)
    scala-support, Some(scala-http4s-v0.76.1-162-ge343b804)
@blast-hardcheese
Copy link
Contributor Author

I'm very sorry to bother, what's the release cycle look like for sbt-git?

For the time being I've bumped back over to JGit since this issue was preventing useful snapshot releases (it was resolving against the wrong root tag).

If there's anything I can do to assist here I'm happy to do it, I'm happy to give back to the SBT org 😊

@SethTisue SethTisue merged commit f079e4b into sbt:main Sep 7, 2024
1 check passed
@SethTisue
Copy link
Member

Thank you for the PR — apparently nobody was minding the shop here. But I'm sure we'll do a release soon in order to ship #248.

@blast-hardcheese blast-hardcheese deleted the console-git-describe-patterns branch September 8, 2024 07:33
@blast-hardcheese
Copy link
Contributor Author

🎉 thanks Seth

@mkurz
Copy link
Member

mkurz commented Oct 7, 2024

Unfortunately JGit still does not support git worktree (though that seems to be coming soon!), so I'm stuck on CLI git.

Worktree read support landed in jgit 7, more links here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants