Skip to content

Commit 41b2569

Browse files
authored
feat: change to use full git SHA1 for release file (#3114)
1 parent 8e043e3 commit 41b2569

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

sbin/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,7 @@ addJVMVariant() {
16181618
}
16191619

16201620
addBuildSHA() { # git SHA of the build repository i.e. openjdk-build
1621-
local buildSHA=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}" rev-parse --short HEAD 2>/dev/null)
1621+
local buildSHA=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}" rev-parse HEAD 2>/dev/null)
16221622
if [[ $buildSHA ]]; then
16231623
# shellcheck disable=SC2086
16241624
echo -e BUILD_SOURCE=\"git:$buildSHA\" >>release
@@ -1747,7 +1747,7 @@ addVendorToJson(){
17471747
addSourceToJson(){ # Pulls the origin repo, or uses 'openjdk-build' in rare cases of failure
17481748
local repoName=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}" config --get remote.origin.url 2>/dev/null)
17491749
local repoNameStr="${repoName:-"ErrorUnknown"}"
1750-
local buildSHA=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}" rev-parse --short HEAD 2>/dev/null)
1750+
local buildSHA=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}" rev-parse HEAD 2>/dev/null)
17511751
if [[ $buildSHA ]]; then
17521752
echo -n "${repoNameStr%%.git}/commit/$buildSHA" > "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/metadata/buildSource.txt"
17531753
else
@@ -1757,7 +1757,7 @@ addSourceToJson(){ # Pulls the origin repo, or uses 'openjdk-build' in rare case
17571757

17581758
addOpenJDKSourceToJson() { # name of git repo for which SOURCE sha is from
17591759
local openjdkSourceRepo=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" config --get remote.origin.url 2>/dev/null)
1760-
local openjdkSHA=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" rev-parse --short HEAD 2>/dev/null)
1760+
local openjdkSHA=$(git -C "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[WORKING_DIR]}/${BUILD_CONFIG[OPENJDK_SOURCE_DIR]}" rev-parse HEAD 2>/dev/null)
17611761
if [[ $openjdkSHA ]]; then
17621762
echo -n "${openjdkSourceRepo%%.git}/commit/${openjdkSHA}" > "${BUILD_CONFIG[WORKSPACE_DIR]}/${BUILD_CONFIG[TARGET_DIR]}/metadata/openjdkSource.txt"
17631763
else

0 commit comments

Comments
 (0)