From e31f9ac2bd3d1b3f00fc33f3fd8ecd3aa4ea5210 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Tue, 27 Sep 2016 11:16:18 +1300 Subject: [PATCH] Fix Circle CI Integration --- index.html | 12 ++++++------ server.js | 13 +++++++------ try.html | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/index.html b/index.html index 35651b5..7f67119 100644 --- a/index.html +++ b/index.html @@ -118,16 +118,16 @@ Pixel-perfect   Retina-ready   Fast   Consistent   Hackable https://img.shields.io/magnumci/ci/96ffb83fa700f069024921b0702e76ff/new-meta.svg CircleCI: - - https://img.shields.io/circleci/project/BrightFlair/PHP.Gt.svg + + https://img.shields.io/circleci/project/github/RedSparr0w/node-csgo-parser.svg CircleCI branch: - - https://img.shields.io/circleci/project/BrightFlair/PHP.Gt/master.svg + + https://img.shields.io/circleci/project/github/RedSparr0w/node-csgo-parser/master.svg CircleCI token: - - https://img.shields.io/circleci/token/YOURTOKEN/project/BrightFlair/PHP.Gt/master.svg + + https://img.shields.io/circleci/token/YOURTOKEN/project/github/RedSparr0w/node-csgo-parser/master.svg Visual Studio Team services: diff --git a/server.js b/server.js index 843e6ba..e2af1eb 100644 --- a/server.js +++ b/server.js @@ -4479,15 +4479,16 @@ cache(function(data, match, sendBadge, request) { // CircleCI build integration. // https://circleci.com/api/v1/project/BrightFlair/PHP.Gt?circle-token=0a5143728784b263d9f0238b8d595522689b3af2&limit=1&filter=completed -camp.route(/^\/circleci\/(?:token\/(\w+))?[+\/]?project\/([^\/]+\/[^\/]+)(?:\/(.*))?\.(svg|png|gif|jpg|json)$/, +camp.route(/^\/circleci\/(?:token\/(\w+))?[+\/]?project\/(github|bitbucket)\/([^\/]+\/[^\/]+)(?:\/(.*))?\.(svg|png|gif|jpg|json)$/, cache(function(data, match, sendBadge, request) { - var token = match[1] - var userRepo = match[2]; // eg, `BrightFlair/PHP.Gt`. - var branch = match[3]; - var format = match[4]; + var token = match[1]; + var type = match[2]; // github OR bitbucket + var userRepo = match[3]; // eg, `RedSparr0w/node-csgo-parser`. + var branch = match[4] + var format = match[5]; // Base API URL - var apiUrl = 'https://circleci.com/api/v1/project/' + userRepo; + var apiUrl = 'https://circleci.com/api/v1.1/project/'+ type +"/"+ userRepo; // Query Params queryParams = {}; diff --git a/try.html b/try.html index c3f502c..473a232 100644 --- a/try.html +++ b/try.html @@ -117,16 +117,16 @@ Pixel-perfect   Retina-ready   Fast   Consistent   Hackable https://img.shields.io/magnumci/ci/96ffb83fa700f069024921b0702e76ff/new-meta.svg CircleCI: - - https://img.shields.io/circleci/project/BrightFlair/PHP.Gt.svg + + https://img.shields.io/circleci/project/github/RedSparr0w/node-csgo-parser.svg CircleCI branch: - - https://img.shields.io/circleci/project/BrightFlair/PHP.Gt/master.svg + + https://img.shields.io/circleci/project/github/RedSparr0w/node-csgo-parser/master.svg CircleCI token: - - https://img.shields.io/circleci/token/YOURTOKEN/project/BrightFlair/PHP.Gt/master.svg + + https://img.shields.io/circleci/token/YOURTOKEN/project/github/RedSparr0w/node-csgo-parser/master.svg Visual Studio Team services: