Merging upstream version 0.8.13.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
4ccf9dc8f1
commit
bc0f764250
28 changed files with 556 additions and 76 deletions
|
@ -14,5 +14,11 @@ func DocsURL(path string) string {
|
|||
path = path[1:]
|
||||
}
|
||||
|
||||
return fmt.Sprintf("https://nicholas-fedor.github.io/shoutrrr/%s/%s", meta.DocsVersion, path)
|
||||
// Use commit for dev builds, version for releases
|
||||
version := meta.GetVersion()
|
||||
if version == "unknown" || version == "dev" {
|
||||
version = meta.GetCommit()
|
||||
}
|
||||
|
||||
return fmt.Sprintf("https://nicholas-fedor.github.io/shoutrrr/%s/%s", version, path)
|
||||
}
|
||||
|
|
|
@ -92,7 +92,7 @@ var _ = ginkgo.Describe("the util package", func() {
|
|||
ginkgo.It("should return the expected URL", func() {
|
||||
expectedBase := fmt.Sprintf(
|
||||
`https://nicholas-fedor.github.io/shoutrrr/%s/`,
|
||||
meta.DocsVersion,
|
||||
meta.GetVersion(),
|
||||
)
|
||||
gomega.Expect(util.DocsURL(``)).To(gomega.Equal(expectedBase))
|
||||
gomega.Expect(util.DocsURL(`services/logger`)).
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue