Ignore GIT_COMMIT when calculating commit hash #28082
Merged
Conversation
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
When finding the commit hash for the build to place in the JAR manifest (which is used to identity the build), the scm-info plugin assumes that GIT_COMMIT is the commit for this build. That assumption is wrong, this build could be a sub-build of another build that GIT_COMMIT belongs to. If GIT_COMMIT is set, we ignore the commit hash calculated by scm-info and calculate the hash ourselves.
jasontedor
added
:Delivery/Build
rjernst
approved these changes
Jan 4, 2018
| * is the commit hash for that build. Therefore, if GIT_COMMIT is set we calculate the commit hash ourselves. | ||
| */ | ||
| if (System.getenv("GIT_COMMIT") != null) { | ||
| def hash = new RepositoryBuilder().findGitDir(project.buildDir).build().resolve(Constants.HEAD).name |
jasontedor
added a commit
that referenced
this pull request
Jan 4, 2018
When finding the commit hash for the build to place in the JAR manifest (which is used to identity the build), the scm-info plugin assumes that GIT_COMMIT is the commit for this build. That assumption is wrong, this build could be a sub-build of another build that GIT_COMMIT belongs to. If GIT_COMMIT is set, we ignore the commit hash calculated by scm-info and calculate the hash ourselves. Relates #28082
jasontedor
added a commit
that referenced
this pull request
Jan 4, 2018
When finding the commit hash for the build to place in the JAR manifest (which is used to identity the build), the scm-info plugin assumes that GIT_COMMIT is the commit for this build. That assumption is wrong, this build could be a sub-build of another build that GIT_COMMIT belongs to. If GIT_COMMIT is set, we ignore the commit hash calculated by scm-info and calculate the hash ourselves. Relates #28082
jasontedor
added a commit
that referenced
this pull request
Jan 4, 2018
When finding the commit hash for the build to place in the JAR manifest (which is used to identity the build), the scm-info plugin assumes that GIT_COMMIT is the commit for this build. That assumption is wrong, this build could be a sub-build of another build that GIT_COMMIT belongs to. If GIT_COMMIT is set, we ignore the commit hash calculated by scm-info and calculate the hash ourselves. Relates #28082
jasontedor
added a commit
that referenced
this pull request
Jan 4, 2018
When finding the commit hash for the build to place in the JAR manifest (which is used to identity the build), the scm-info plugin assumes that GIT_COMMIT is the commit for this build. That assumption is wrong, this build could be a sub-build of another build that GIT_COMMIT belongs to. If GIT_COMMIT is set, we ignore the commit hash calculated by scm-info and calculate the hash ourselves. Relates #28082
|
Is it possible that something went wrong with this patch? If I download build snapshot from https://download.elastic.co/esvm/snapshots/6.1.zip it contains {
"name" : "q9gSC4_",
"cluster_name" : "elasticsearch",
"cluster_uuid" : "zNOfg0gQTwC0UFDoVjEcpg",
"version" : {
"number" : "6.1.2",
"build_hash" : "esCommi",
"build_date" : "2018-01-04T18:42:14.730Z",
"build_snapshot" : true,
"lucene_version" : "7.1.0",
"minimum_wire_compatibility_version" : "5.6.0",
"minimum_index_compatibility_version" : "5.0.0"
},
"tagline" : "You Know, for Search"
}// Related to elastic/elasticsearch-php#711 |
Member
Author
|
There's no chance that was caused by this change. It was caused by this change to the esvm snapshot builder. I've reached out internally to have it fixed. |
spalger
added a commit
to elastic/esvm-snapshot-builder
that referenced
this pull request
Jan 4, 2018
Remove GIT_COMMIT setting, since it didn't work and elastic/elasticsearch#28082 is merged
Contributor
|
@mhujer Sorry about the hasty fix/bug, https://download.elastic.co/esvm/snapshots/6.1.zip is correct now: {
"name" : "Ldm-0Ow",
"cluster_name" : "elasticsearch",
"cluster_uuid" : "gsH7uboEQWKUrmK43z_nBQ",
"version" : {
"number" : "6.1.2",
"build_hash" : "e345797",
"build_date" : "2018-01-04T20:58:28.717Z",
"build_snapshot" : true,
"lucene_version" : "7.1.0",
"minimum_wire_compatibility_version" : "5.6.0",
"minimum_index_compatibility_version" : "5.0.0"
},
"tagline" : "You Know, for Search"
} |
|
Thanks for fixing it! 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
When finding the commit hash for the build to place in the JAR manifest (which is used to identity the build), the scm-info plugin assumes that GIT_COMMIT is the commit for this build. That assumption is wrong, this build could be a sub-build of another build that GIT_COMMIT belongs to. If GIT_COMMIT is set, we ignore the commit hash calculated by scm-info and calculate the hash ourselves.