Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
clpm
clpm
Commits
cb053f51
Commit
cb053f51
authored
Sep 23, 2021
by
Eric Timmons
Browse files
use main as the default branch in version number computation
[skip ci]
parent
754a856a
Pipeline
#4832
skipped
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
clpm-asdf/version.lisp
View file @
cb053f51
...
...
@@ -51,11 +51,11 @@ NIL until an image is dumped and is set by ~cache-full-version~.")
:separator
'
(
#\-
)))
(
defun
get-git-common-ancestor
()
(
clpm-git
'
(
"merge-base"
"HEAD"
"origin/ma
ster
"
)
(
clpm-git
'
(
"merge-base"
"HEAD"
"origin/ma
in
"
)
:output
'
(
:string
:stripped
t
)))
(
defun
get-git-distance-from-ma
ster
()
(
parse-integer
(
clpm-git
'
(
"rev-list"
"--count"
"HEAD"
"--not"
"origin/ma
ster
"
)
(
defun
get-git-distance-from-ma
in
()
(
parse-integer
(
clpm-git
'
(
"rev-list"
"--count"
"HEAD"
"--not"
"origin/ma
in
"
)
:output
'
(
:string
:stripped
t
))))
(
defun
get-git-tag
()
...
...
@@ -85,7 +85,7 @@ NIL until an image is dumped and is set by ~cache-full-version~.")
(
prerelease-category
(
cl-semver:version-pre-release-identifiers
version
)))
(
unless
prerelease-category
(
setf
prerelease-category
'
(
0
)))
(
if
(
equal
git-branch
"ma
ster
"
)
(
if
(
equal
git-branch
"ma
in
"
)
(
format
nil
"~{~A~^.~}-~{~A~^.~}.~A+~A~:[~;-dirty~]"
primary-version
prerelease-category
...
...
@@ -94,12 +94,12 @@ NIL until an image is dumped and is set by ~cache-full-version~.")
git-dirty-p
)
(
let*
((
ancestor
(
get-git-common-ancestor
))
(
ancestor-describe
(
get-git-describe
ancestor
))
(
distance-from-ma
ster
(
get-git-distance-from-ma
ster
)))
(
distance-from-ma
in
(
get-git-distance-from-ma
in
)))
(
format
nil
"~{~A~^.~}-~{~A~^.~}.~A.0.~A.~A+~A~:[~;-dirty~]"
primary-version
prerelease-category
(
second
ancestor-describe
)
git-branch
distance-from-ma
ster
distance-from-ma
in
(
third
git-describe
)
git-dirty-p
)))))))
;; We don't have git... Best we can currently do is return the base
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment