suzanne.soy/shields
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regexp for Jenkins build badges to allow “/“ in the job name.

Browse Source
This commit is contained in:
Masahiro Fujiwara 2017-01-17 06:07:05 +09:00
parent 21ae49ad85
commit 7ac216456a
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server.js
View File

@ -3849,12 +3849,12 @@ cache(function(data, match, sendBadge, request) {
})); }));
// Jenkins build status integration // Jenkins build status integration
camp.route(/^\/jenkins(-ci)?\/s\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg|json)$/, camp.route(/^\/jenkins(?:-ci)?\/s\/(http(?:s)?)\/([^\/]+)\/(.+)\.(svg|png|gif|jpg|json)$/,
cache(function(data, match, sendBadge, request) { cache(function(data, match, sendBadge, request) {
var scheme = match[2]; // http(s) var scheme = match[1]; // http(s)
var host = match[4]; // jenkins.qa.ubuntu.com var host = match[2]; // example.org:8080
var job = match[5]; // precise-desktop-amd64_default var job = match[3]; // folder/job
var format = match[6]; var format = match[4];
var options = { var options = {
json: true, json: true,
uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color' uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color'
@ -3902,12 +3902,12 @@ cache(function(data, match, sendBadge, request) {
})); }));
// Jenkins tests integration // Jenkins tests integration
camp.route(/^\/jenkins(-ci)?\/t\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg|json)$/, camp.route(/^\/jenkins(?:-ci)?\/t\/(http(?:s)?)\/([^\/]+)\/(.+)\.(svg|png|gif|jpg|json)$/,
cache(function(data, match, sendBadge, request) { cache(function(data, match, sendBadge, request) {
var scheme = match[2]; // http(s) var scheme = match[1]; // http(s)
var host = match[4]; // jenkins.qa.ubuntu.com var host = match[2]; // example.org:8080
var job = match[5]; // precise-desktop-amd64_default var job = match[3]; // folder/job
var format = match[6]; var format = match[4];
var options = { var options = {
json: true, json: true,
uri: scheme + '://' + host + '/job/' + job uri: scheme + '://' + host + '/job/' + job
@ -3958,12 +3958,12 @@ cache(function(data, match, sendBadge, request) {
})); }));
// Jenkins coverage integration // Jenkins coverage integration
camp.route(/^\/jenkins(-ci)?\/c\/(http(s)?)\/((?:[^\/]+)(?:\/.+?)?)\/([^\/]+)\.(svg|png|gif|jpg|json)$/, camp.route(/^\/jenkins(?:-ci)?\/c\/(http(?:s)?)\/([^\/]+)\/(.+)\.(svg|png|gif|jpg|json)$/,
cache(function(data, match, sendBadge, request) { cache(function(data, match, sendBadge, request) {
var scheme = match[2]; // http(s) var scheme = match[1]; // http(s)
var host = match[4]; // jenkins.qa.ubuntu.com var host = match[2]; // example.org:8080
var job = match[5]; // precise-desktop-amd64_default var job = match[3]; // folder/job
var format = match[6]; var format = match[4];
var options = { var options = {
json: true, json: true,
uri: scheme + '://' + host + '/job/' + job uri: scheme + '://' + host + '/job/' + job