Skip to content

Commit 97eafbc

Browse files
committedAug 10, 2020
Store the default CodeQL bundle version in a JSON file.
1 parent 6e18b27 commit 97eafbc

File tree

6 files changed

+13
-4
lines changed

6 files changed

+13
-4
lines changed
 

Diff for: ‎lib/codeql.js

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎lib/codeql.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎lib/defaults.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"bundleVersion": "codeql-bundle-20200630"
3+
}

Diff for: ‎src/codeql.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import * as globalutil from 'util';
1212
import uuidV4 from 'uuid/v4';
1313

1414
import * as api from './api-client';
15+
import * as defaults from './defaults.json'; // Referenced from codeql-action-sync-tool!
1516
import * as util from './util';
1617

1718
export interface CodeQL {
@@ -81,7 +82,7 @@ let cachedCodeQL: CodeQL | undefined = undefined;
8182
*/
8283
const CODEQL_ACTION_CMD = "CODEQL_ACTION_CMD";
8384

84-
const CODEQL_BUNDLE_VERSION = "codeql-bundle-20200630";
85+
const CODEQL_BUNDLE_VERSION = defaults.bundleVersion;
8586
const CODEQL_BUNDLE_NAME = "codeql-bundle.tar.gz";
8687
const CODEQL_DEFAULT_ACTION_REPOSITORY = "github/codeql-action";
8788

Diff for: ‎src/defaults.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"bundleVersion": "codeql-bundle-20200630"
3+
}

Diff for: ‎tsconfig.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
// "typeRoots": [], /* List of folders to include type definitions from. */
4646
// "types": [], /* Type declaration files to be included in compilation. */
4747
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
48-
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
48+
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
4949
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
5050
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
51+
"resolveJsonModule": true,
5152

5253
/* Source Map Options */
5354
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */

0 commit comments

Comments
 (0)
Please sign in to comment.