THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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

pull/1743/merge
techknowlogick 8 months ago
parent
commit
080428b2bf
No account linked to committer's email address
3 changed files with 19 additions and 19 deletions
  1. 9
    9
      .drone.yml
  2. 4
    4
      modules/markup/html.go
  3. 6
    6
      modules/templates/helper.go

+ 9
- 9
.drone.yml View File

@@ -22,7 +22,7 @@ pipeline:
22 22
       branch: [ master ]
23 23
 
24 24
   update-translations:
25
-    image: alpine:3.6
25
+    image: alpine:3.7
26 26
     commands:
27 27
       - mv ./options/locale/locale_en-US.ini ./options/
28 28
       - sed -i -e 's/="/=/g' -e 's/"$$//g' ./options/locale/*.ini
@@ -64,7 +64,7 @@ pipeline:
64 64
       event: [ push, tag, pull_request ]
65 65
 
66 66
   build:
67
-    image: golang:1.10
67
+    image: golang:1.11
68 68
     pull: true
69 69
     environment:
70 70
       TAGS: bindata sqlite
@@ -83,7 +83,7 @@ pipeline:
83 83
       event: [ push, tag, pull_request ]
84 84
 
85 85
   test:
86
-    image: golang:1.10
86
+    image: golang:1.11
87 87
     pull: true
88 88
     group: test
89 89
     environment:
@@ -95,7 +95,7 @@ pipeline:
95 95
       branch: [ master ]
96 96
 
97 97
   test:
98
-    image: golang:1.10
98
+    image: golang:1.11
99 99
     pull: true
100 100
     group: test
101 101
     environment:
@@ -107,7 +107,7 @@ pipeline:
107 107
       branch: [ release/* ]
108 108
 
109 109
   test:
110
-    image: golang:1.10
110
+    image: golang:1.11
111 111
     pull: true
112 112
     group: test
113 113
     environment:
@@ -130,7 +130,7 @@ pipeline:
130 130
   #     event: [ push, tag, pull_request ]
131 131
 
132 132
   test-mysql:
133
-    image: golang:1.10
133
+    image: golang:1.11
134 134
     pull: true
135 135
     group: test
136 136
     environment:
@@ -145,7 +145,7 @@ pipeline:
145 145
       branch: [ master ]
146 146
 
147 147
   test-mysql:
148
-    image: golang:1.10
148
+    image: golang:1.11
149 149
     pull: true
150 150
     group: test
151 151
     environment:
@@ -159,7 +159,7 @@ pipeline:
159 159
       event: [ tag ]
160 160
 
161 161
   test-pgsql:
162
-    image: golang:1.10
162
+    image: golang:1.11
163 163
     pull: true
164 164
     group: test
165 165
     environment:
@@ -173,7 +173,7 @@ pipeline:
173 173
       event: [ push, tag, pull_request ]
174 174
 
175 175
   generate-coverage:
176
-    image: golang:1.10
176
+    image: golang:1.11
177 177
     pull: true
178 178
     environment:
179 179
       TAGS: bindata

+ 4
- 4
modules/markup/html.go View File

@@ -191,10 +191,10 @@ func PostProcess(
191 191
 ) ([]byte, error) {
192 192
 	// create the context from the parameters
193 193
 	ctx := &postProcessCtx{
194
-		metas:          metas,
195
-		urlPrefix:      urlPrefix,
196
-		isWikiMarkdown: isWikiMarkdown,
197
-		procs:          defaultProcessors,
194
+		metas:                   metas,
195
+		urlPrefix:               urlPrefix,
196
+		isWikiMarkdown:          isWikiMarkdown,
197
+		procs:                   defaultProcessors,
198 198
 		visitLinksForShortLinks: true,
199 199
 	}
200 200
 	return ctx.postProcess(rawHTML)

+ 6
- 6
modules/templates/helper.go View File

@@ -103,12 +103,12 @@ func NewFuncMap() []template.FuncMap {
103 103
 			}
104 104
 			return str[start:end]
105 105
 		},
106
-		"EllipsisString":    base.EllipsisString,
107
-		"DiffTypeToStr":     DiffTypeToStr,
108
-		"DiffLineTypeToStr": DiffLineTypeToStr,
109
-		"Sha1":              Sha1,
110
-		"ShortSha":          base.ShortSha,
111
-		"MD5":               base.EncodeMD5,
106
+		"EllipsisString":        base.EllipsisString,
107
+		"DiffTypeToStr":         DiffTypeToStr,
108
+		"DiffLineTypeToStr":     DiffLineTypeToStr,
109
+		"Sha1":                  Sha1,
110
+		"ShortSha":              base.ShortSha,
111
+		"MD5":                   base.EncodeMD5,
112 112
 		"ActionContent2Commits": ActionContent2Commits,
113 113
 		"PathEscape":            url.PathEscape,
114 114
 		"EscapePound": func(str string) string {

Loading…
Cancel
Save