Skip to content

Build cache fixes #3335

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
dondonz merged 3 commits into from
Oct 17, 2023
Merged

Build cache fixes #3335

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3f9e7c
Use stable version number on clean workspace
Duhemm Sep 21, 2023
e05cd77
Relativize Antlr sources in cache key
Duhemm Sep 21, 2023
42cfa6e
Address review feedback
Duhemm Sep 25, 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
50 changes: 34 additions & 16 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,45 @@ java {
}
}

def makeDevelopmentVersion(parts) {
def version = String.join("-", parts)
println "created development version: $version"
return version
}

def getDevelopmentVersion() {
def dateTime = new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date())
def gitCheckOutput = new StringBuilder()
def gitCheckError = new StringBuilder()
def gitCheck = ["git", "rev-parse", "--is-inside-work-tree"].execute()
def gitCheck = ["git", "-C", projectDir.toString(), "rev-parse", "--is-inside-work-tree"].execute()
gitCheck.waitForProcessOutput(gitCheckOutput, gitCheckError)
def isGit = gitCheckOutput.toString().trim()
if (isGit != "true") {
def version = "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-no-git"
println "created development version: $version"
return version
return makeDevelopmentVersion(["0.0.0", dateTime, "no-git"])
}

def gitHashOutput = new StringBuilder()
def gitHashError = new StringBuilder()
def gitShortHash = ["git", "-C", projectDir.toString(), "rev-parse", "--short", "HEAD"].execute()
gitShortHash.waitForProcessOutput(gitHashOutput, gitHashError)
def gitHash = gitHashOutput.toString().trim()
if (gitHash.isEmpty()) {
println "git hash is empty: error: ${error.toString()}"
throw new IllegalStateException("git hash could not be determined")
def isCi = Boolean.parseBoolean(System.env.CI)
if (isCi) {
def gitHashOutput = new StringBuilder()
def gitHashError = new StringBuilder()
def gitShortHash = ["git", "-C", projectDir.toString(), "rev-parse", "--short", "HEAD"].execute()
gitShortHash.waitForProcessOutput(gitHashOutput, gitHashError)
def gitHash = gitHashOutput.toString().trim()
if (gitHash.isEmpty()) {
println "git hash is empty: error: ${gitHashError.toString()}"
throw new IllegalStateException("git hash could not be determined")
}

return makeDevelopmentVersion(["0.0.0", dateTime, gitHash])
}
def version = "0.0.0-" + new SimpleDateFormat('yyyy-MM-dd\'T\'HH-mm-ss').format(new Date()) + "-" + gitHash
println "created development version: $version"
version

def gitRevParseOutput = new StringBuilder()
def gitRevParseError = new StringBuilder()
def gitRevParse = ["git", "-C", projectDir.toString(), "rev-parse", "--abbrev-ref", "HEAD"].execute()
gitRevParse.waitForProcessOutput(gitRevParseOutput, gitRevParseError)
def branchName = gitRevParseOutput.toString().trim()

return makeDevelopmentVersion(["0.0.0", branchName, "SNAPSHOT"])
}

def reactiveStreamsVersion = '1.0.3'
Expand Down Expand Up @@ -203,7 +218,10 @@ generateGrammarSource {
arguments += ["-visitor"]
outputDirectory = file("${project.buildDir}/generated-src/antlr/main/graphql/parser/antlr")
}
generateGrammarSource.inputs.dir('src/main/antlr')
generateGrammarSource.inputs
.dir('src/main/antlr')
.withPropertyName('sourceDir')
.withPathSensitivity(PathSensitivity.RELATIVE)


task sourcesJar(type: Jar) {
Expand Down