Skip to content

KAFKA-14767: Fix missing commitId build error after git gc #13315

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
ijuma merged 7 commits into from
Oct 22, 2023
Merged

KAFKA-14767: Fix missing commitId build error after git gc #13315

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27d9f2d
KAFKA-14767: Fix missing commitId build error after git gc
gharris1727 Feb 27, 2023
7b13925
fixup: extract repo to common variable
gharris1727 Feb 28, 2023
2a185cf
fixup: force rat to run after clients:processTestMessages
gharris1727 Mar 1, 2023
e33c572
Merge remote-tracking branch 'upstream/trunk' into kafka-14767-missin…
gharris1727 Jun 12, 2023
eb6eee8
fixup: use isDirectory to disable grgit in worktrees
gharris1727 Jun 12, 2023
363b993
Merge remote-tracking branch 'upstream/trunk' into kafka-14767-missin…
gharris1727 Jun 23, 2023
640d987
Merge remote-tracking branch 'upstream/trunk' into kafka-14767-missin…
gharris1727 Oct 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
16 changes: 4 additions & 12 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ ext {
throw new GradleException("Unexpected value for scalaOptimizerMode property. Expected one of $scalaOptimizerValues, but received: $userScalaOptimizerMode")

generatedDocsDir = new File("${project.rootDir}/docs/generated")
repo = file("$rootDir/.git").isDirectory() ? Grgit.open(currentDir: project.getRootDir()) : null

commitId = determineCommitId()
}
Expand Down Expand Up @@ -164,24 +165,16 @@ def determineCommitId() {
def takeFromHash = 16
if (project.hasProperty('commitId')) {
commitId.take(takeFromHash)
} else if (file("$rootDir/.git/HEAD").exists()) {
def headRef = file("$rootDir/.git/HEAD").text
if (headRef.contains('ref: ')) {
headRef = headRef.replaceAll('ref: ', '').trim()
if (file("$rootDir/.git/$headRef").exists()) {
file("$rootDir/.git/$headRef").text.trim().take(takeFromHash)
}
} else {
headRef.trim().take(takeFromHash)
}
} else if (repo != null) {
repo.head().id.take(takeFromHash)
} else {
"unknown"
}
}

apply from: file('wrapper.gradle')

if (file('.git').exists()) {
if (repo != null) {
rat {
dependsOn subprojects.collect {
it.tasks.matching {
Expand All @@ -195,7 +188,6 @@ if (file('.git').exists()) {

// Exclude everything under the directory that git should be ignoring via .gitignore or that isn't checked in. These
// restrict us only to files that are checked in or are staged.
def repo = Grgit.open(currentDir: project.getRootDir())
excludes = new ArrayList<String>(repo.clean(ignore: false, directories: true, dryRun: true))
// And some of the files that we have checked in should also be excluded from this check
excludes.addAll([
Expand Down