improve regex

github · Jun 19, 2020 · 5eccb79 · 5eccb79
1 parent 11a9af0
commit 5eccb79
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/lib/setup-tools.js b/lib/setup-tools.js
diff --git a/lib/setup-tools.js.map b/lib/setup-tools.js.map
diff --git a/lib/setup-tools.test.js b/lib/setup-tools.test.js
diff --git a/lib/setup-tools.test.js.map b/lib/setup-tools.test.js.map
diff --git a/src/setup-tools.test.ts b/src/setup-tools.test.ts
@@ -57,7 +57,7 @@ test('parse codeql bundle url version', t => {
 
             try {
                 const parsedVersion = setupTools.getCodeQLURLVersion(url);
-                t.assert(parsedVersion, expectedVersion);
+                t.deepEqual(parsedVersion, expectedVersion);
             } catch (e) {
                 t.fail(e.message);
             }

diff --git a/src/setup-tools.ts b/src/setup-tools.ts
@@ -52,7 +52,7 @@ export async function setupCodeQL(): Promise<CodeQLSetup> {
 
 export function getCodeQLURLVersion(url: string): string {
 
-    const match = url.match(/codeql-bundle-([\d+(\.\d+)]+)/);
+    const match = url.match(/\/codeql-bundle-(.*)\//);
     if (match === null || match.length < 2) {
         throw new Error(`Malformed tools url: ${url}. Version could not be inferred`);
     }