Skip to content

Commit 1ca6097

Browse files
committed
Fixed sha to not have the 'g' for git.
Swapped 'r' to 'v' now that I've had more coffee and sleep.
1 parent 49b3e84 commit 1ca6097

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ INITIALISATION
306306
value="${maven.version.number}-${git.commit.date}-${git.commit.drift}-${git.commit.sha}"/>
307307
<property
308308
name="osgi.version.number"
309-
value="${version.major}.${version.minor}.${version.patch}.r${git.commit.date}${version.suffix}-${git.commit.sha}"/>
309+
value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/>
310310

311311

312312
<!-- And print-out what we are building -->

tools/get-scala-commit-sha

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# If no dir is given, current working dir is used.
66
#
77
# Example build version string:
8-
# g6f1c486d0b
8+
# 6f1c486d0ba
99
#
1010

1111
[[ $# -eq 0 ]] || cd "$1"
@@ -35,5 +35,6 @@ tag=$(git describe --tags --match 'v2*' --abbrev=0)
3535
described=$(git describe --tags --match 'v2*' --abbrev=10)
3636
suffix="${described##${tag}-}"
3737
hash=$(echo $suffix | cut -d - -f 2)
38+
hash=${hash#g}
3839

3940
echo "$hash"

0 commit comments

Comments
 (0)