GitHub Issue 774: Fix distribution file name for snapshot versions #240
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -452,9 +452,10 @@ class BuildUtils | |
| } | ||
| } | ||
|
|
||
| if (project.hasProperty("includeVcs")) | ||
| { | ||
| Properties vcsProps = getStandardVCSProperties(project) | ||
| String rootBranch = vcsProps.get(VCS_BRANCH_PROP_NAME) | ||
| project.logger.info("${project.path} rootBranch ${rootBranch}") | ||
| if (rootBranch.startsWith("release") && /* e.g. release20.11-SNAPSHOT */ | ||
| project.labkeyVersion.contains("-SNAPSHOT")) /* e.g. 20.11-SNAPSHOT */ | ||
|
|
@@ -490,41 +491,47 @@ class BuildUtils | |
| return version | ||
| } | ||
|
|
||
| public static final String VCS_URL_PROP_NAME = "VcsURL" | ||
| public static final String VCS_BRANCH_PROP_NAME = "VcsBranch" | ||
| public static final String VCS_TAG_PROP_NAME = "VcsTag" | ||
| public static final String VCS_REVISION_PROP_NAME = "VcsRevision" | ||
| public static final String BUILD_NUMBER_PROP_NAME = "BuildNumber" | ||
|
|
||
| static Properties getStandardVCSProperties(project) | ||
| { | ||
| String buildNumber = | ||
| (String) TeamCityExtension.getTeamCityProperty(project, "system.teamcity.agent.dotnet.build_id", // Unique build ID | ||
| TeamCityExtension.getTeamCityProperty(project,"build.number", null)) | ||
| Properties ret = new Properties() | ||
| def gitCmd = SystemUtils.IS_OS_WINDOWS ? "git.exe" : "git" | ||
| if (project.hasProperty("includeVcs") && (!project.hasProperty("lkModule") || project.lkModule.getModProperties().get(VCS_URL_PROP_NAME).isEmpty())) | ||
| { | ||
| def url = "${gitCmd} -C ${project.projectDir.absolutePath} config --get remote.origin.url".execute().text.trim() | ||
| Matcher matcher = GIT_URL_WITH_TOKEN.matcher(url) | ||
| if (matcher.matches()) // Strip out the token if included in the URL. | ||
| url = matcher.group(1) + "@" + matcher.group(3) | ||
| ret.setProperty(VCS_URL_PROP_NAME, url) | ||
| project.logger.info("${project.path} git url: ${url}") | ||
| def branch = "${gitCmd} -C ${project.projectDir.absolutePath} rev-parse --abbrev-ref HEAD".execute().text.trim() | ||
| project.logger.info("${project.path} git branch: ${branch}") | ||
| ret.setProperty(VCS_BRANCH_PROP_NAME, branch) | ||
| def revision = "${gitCmd} -C ${project.projectDir.absolutePath} rev-parse @".execute().text.trim() | ||
| project.logger.info("${project.path} git revision: ${revision}") | ||
| ret.setProperty(VCS_REVISION_PROP_NAME, revision) | ||
| def tag = "${gitCmd} -C ${project.projectDir.absolutePath} describe --tags --exact-match 2> /dev/null".execute().text.trim() | ||
| project.logger.info("${project.path} git tag: ${revision}") | ||
| if (!tag.isEmpty() && !tag.equals(revision)) | ||
| ret.setProperty(VCS_TAG_PROP_NAME, tag) | ||
| else | ||
| ret.setProperty(VCS_TAG_PROP_NAME, "")} | ||
| else if (!project.hasProperty("includeVcs")) | ||
| { | ||
| ret.setProperty(VCS_BRANCH_PROP_NAME, "Unknown") | ||
| ret.setProperty(VCS_TAG_PROP_NAME, "Unknown") | ||
| ret.setProperty(VCS_URL_PROP_NAME, "Unknown") | ||
| ret.setProperty(VCS_REVISION_PROP_NAME, "Unknown") | ||
| } | ||
| ret.setProperty(BUILD_NUMBER_PROP_NAME, buildNumber != null ? buildNumber : "Unknown") | ||
| return ret | ||
| } | ||
|
|
||
|
|
@@ -594,7 +601,7 @@ class BuildUtils | |
|
|
||
| static void addModuleDistributionDependency(Project distributionProject, String depProjectPath, String config, boolean addTransitive) | ||
| { | ||
| if (distributionProject.configurations.named(config) == null) | ||
| distributionProject.configurations { | ||
| config | ||
| } | ||
|
|
@@ -613,16 +620,16 @@ class BuildUtils | |
| return | ||
|
|
||
| distributionProject.evaluationDependsOn(depProject.getPath()) | ||
| if (depProject.configurations.named("modules") != null) { | ||
|
Member
There was a problem hiding this comment. I don't think this will work the same way.
Contributor
Author
There was a problem hiding this comment. Ah, you are so right. I forgot about that. (You would think I might remember since it's really annoying that this throws an exception). |
||
| depProject.configurations.modules.dependencies.each { dep -> | ||
| if (dep instanceof ProjectDependency) | ||
| { | ||
| if (!pathsAdded.contains(dep.getPath())) { | ||
| distributionProject.logger.info("${distributionProject.path}: Adding '${config}' dependency on ${dep}") | ||
| distributionProject.dependencies.add(config, dep) | ||
| distributionProject.evaluationDependsOn(dep.getPath()) | ||
| pathsAdded.add(dep.getPath()) | ||
| distributionProject.logger.info("${distributionProject.path}: Adding recursive '${config}' dependenices from ${dep.getPath()}") | ||
| addTransitiveModuleDependencies(distributionProject, depProject.project(dep.getPath()), config, pathsAdded) | ||
| } | ||
| } | ||
|
|
@@ -974,7 +981,7 @@ class BuildUtils | |
| { | ||
| try { | ||
| project.configurations.named(configName) { Configuration config -> | ||
| config.resolutionStrategy.dependencySubstitution { DependencySubstitutions ds -> | ||
| project.rootProject.subprojects { | ||
| Project p -> | ||
| { | ||
|
|
@@ -985,7 +992,7 @@ class BuildUtils | |
| p.plugins.hasPlugin('org.labkey.build.javaModule') | ||
| ) { | ||
| ds.substitute ds.module("org.labkey.module:${p.name}") using ds.project(p.path) | ||
| p.logger.info("Substituting org.labkey.module:${p.name} with ${p.path}") | ||
| } | ||
| // if (p.plugins.hasPlugin('org.labkey.build.api')) | ||
| // { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this could use
maybeCreate.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Done.