OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve regex to ignore trailing -dirty and for rc tags 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2017-05-04 16:22:39 +01:00
parent 2edfc3e598
commit 3c6e301f7f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/UserSettings.js
View File

@ -35,10 +35,10 @@ import AccessibleButton from '../views/elements/AccessibleButton';
const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJson.gitHead || '<local>'; const REACT_SDK_VERSION = 'dist' in packageJson ? packageJson.version : packageJson.gitHead || '<local>';
// Simple method to help prettify GH Release Tags and Commit Hashes. // Simple method to help prettify GH Release Tags and Commit Hashes.
const semVerRegex = /^v?(\d+\.\d+\.\d+)(?:-(?:\d+-g)?(.+))?|$/i; const semVerRegex = /^v?(\d+\.\d+\.\d+(?:-rc.+)?)(?:-(?:\d+-g)?([0-9a-fA-F]+))?(?:-dirty)?$/i;
const gHVersionLabel = function(repo, token) { const gHVersionLabel = function(repo, token) {
const match = token.match(semVerRegex); const match = token.match(semVerRegex);
let url; // assume commit hash let url;
if (match && match[1]) { // basic semVer string possibly with commit hash if (match && match[1]) { // basic semVer string possibly with commit hash
url = (match.length > 1 && match[2]) url = (match.length > 1 && match[2])
? `https://github.com/${repo}/commit/${match[2]}` ? `https://github.com/${repo}/commit/${match[2]}`