Skip to content

Commit 3a38327

Browse files
committed
Tweaking build string some more.
Reintroduced date and an "r" to meet IDE needs. Moved reference commit backward to accomodate 2.8.x. Merging changes into 2.8.x, 2.9.x, and master.
1 parent a348cc3 commit 3a38327

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

tools/get-scala-revision

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77

88
# not like releases come out so often that we are duty-bound
99
# to recalculate this every time.
10-
# git merge-base v2.9.1 master
11-
devbase="d6f3184fc8"
10+
# git merge-base v2.8.2 v2.9.1 master
11+
devbase="df13e31bbb"
1212

1313
# reimplementing git describe hopefully in a way which works
1414
# without any particular tags, branches, or recent versions of git.
1515
# this is supposed to generate
1616
# dev-NNNN-g<sha>
1717
# where NNNN is the number of commits since devbase, which
1818
# is the merge-base of the most recent release and master.
19-
# Presently hardcoded to reduce uncertainty, v2.9.1/master.
19+
# Presently hardcoded to reduce uncertainty, v2.8.2/v2.9.1/master.
2020
commits=$(git --no-pager log --pretty=oneline $devbase..HEAD | wc -l)
2121
sha=$(git rev-list -n 1 HEAD)
22-
printf "dev-%s-g%s\n" $commits ${sha:0:7}
22+
datestr=$(date "+%Y-%m-%d")
23+
24+
printf "rdev-%s-%s-g%s\n" $commits $datestr ${sha:0:7}

0 commit comments

Comments
 (0)