Skip to content

Upgrade images in .drone.yml to more recent versions #4819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 29, 2018
Merged

Upgrade images in .drone.yml to more recent versions #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9488838
Upgrade packages in .drone.yml to more recent versions
techknowlogick Aug 29, 2018
d07aaaa
Merge branch 'master' into techknowlogick-patch-10
techknowlogick Aug 29, 2018
0403d0b
make fmt fix
techknowlogick Aug 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pipeline:
branch: [ master ]

update-translations:
image: alpine:3.6
image: alpine:3.7
commands:
- mv ./options/locale/locale_en-US.ini ./options/
- sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
Expand Down Expand Up @@ -64,7 +64,7 @@ pipeline:
event: [ push, tag, pull_request ]

build:
image: golang:1.10
image: golang:1.11
pull: true
environment:
TAGS: bindata sqlite
Expand All @@ -83,7 +83,7 @@ pipeline:
event: [ push, tag, pull_request ]

test:
image: golang:1.10
image: golang:1.11
pull: true
group: test
environment:
Expand All @@ -95,7 +95,7 @@ pipeline:
branch: [ master ]

test:
image: golang:1.10
image: golang:1.11
pull: true
group: test
environment:
Expand All @@ -107,7 +107,7 @@ pipeline:
branch: [ release/* ]

test:
image: golang:1.10
image: golang:1.11
pull: true
group: test
environment:
Expand All @@ -130,7 +130,7 @@ pipeline:
# event: [ push, tag, pull_request ]

test-mysql:
image: golang:1.10
image: golang:1.11
pull: true
group: test
environment:
Expand All @@ -145,7 +145,7 @@ pipeline:
branch: [ master ]

test-mysql:
image: golang:1.10
image: golang:1.11
pull: true
group: test
environment:
Expand All @@ -159,7 +159,7 @@ pipeline:
event: [ tag ]

test-pgsql:
image: golang:1.10
image: golang:1.11
pull: true
group: test
environment:
Expand All @@ -173,7 +173,7 @@ pipeline:
event: [ push, tag, pull_request ]

generate-coverage:
image: golang:1.10
image: golang:1.11
pull: true
environment:
TAGS: bindata
Expand Down
8 changes: 4 additions & 4 deletions modules/markup/html.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ func PostProcess(
) ([]byte, error) {
// create the context from the parameters
ctx := &postProcessCtx{
metas: metas,
urlPrefix: urlPrefix,
isUncycloMarkdown: isUncycloMarkdown,
procs: defaultProcessors,
metas: metas,
urlPrefix: urlPrefix,
isUncycloMarkdown: isUncycloMarkdown,
procs: defaultProcessors,
visitLinksForShortLinks: true,
}
return ctx.postProcess(rawHTML)
Expand Down
12 changes: 6 additions & 6 deletions modules/templates/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ func NewFuncMap() []template.FuncMap {
}
return str[start:end]
},
"EllipsisString": base.EllipsisString,
"DiffTypeToStr": DiffTypeToStr,
"DiffLineTypeToStr": DiffLineTypeToStr,
"Sha1": Sha1,
"ShortSha": base.ShortSha,
"MD5": base.EncodeMD5,
"EllipsisString": base.EllipsisString,
"DiffTypeToStr": DiffTypeToStr,
"DiffLineTypeToStr": DiffLineTypeToStr,
"Sha1": Sha1,
"ShortSha": base.ShortSha,
"MD5": base.EncodeMD5,
"ActionContent2Commits": ActionContent2Commits,
"PathEscape": url.PathEscape,
"EscapePound": func(str string) string {
Expand Down