Merge branch 'main' into aeisenberg/multi-lang-packs

.github/workflows/check-for-conflicts.yml

@@ -4,7 +4,7 @@ name: Check for conflicts
 
 on:
   pull_request:
-    branches: [main, v1, v2]
+    branches: [main, releases/v1, releases/v2]
     # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
     # by other workflows.
     types: [opened, synchronize, reopened, ready_for_review]

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 - CodeQL query packs listed in the `packs` configuration field will be skipped if their target language is not being analyzed in the current Actions job. Previously, this would throw an error. [#1116](https://github.com/github/codeql-action/pull/1116)
 
+## 2.1.14 - 22 Jun 2022
+
+No user facing changes.
+
 ## 2.1.13 - 21 Jun 2022
 
 - Update default CodeQL bundle version to 2.9.4. [#1100](https://github.com/github/codeql-action/pull/1100)

node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "2.1.14",
+      "version": "2.1.15",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^1.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "private": true,
   "description": "CodeQL action",
   "scripts": {

runner/package.json

@@ -7,11 +7,10 @@
     "build-runner": "webpack --mode production && pkg dist/codeql-runner.js  --out-path dist"
   },
   "license": "MIT",
-  "dependencies": {},
   "devDependencies": {
     "pkg": "^5.3.1",
-    "ts-loader": "9.2.5",
+    "ts-loader": "^9.3.1",
-    "webpack": "^5.50.0",
+    "webpack": "^5.73.0",
-    "webpack-cli": "^4.7.2"
+    "webpack-cli": "^4.10.0"
   }
 }