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

github · Jun 24, 2022 · b38dc80 · b38dc80
2 parents e041151 + 4efa7d6
commit b38dc80
Show file tree

Hide file tree

Showing 7 changed files with 2,963 additions and 164 deletions.
diff --git a/.github/workflows/check-for-conflicts.yml b/.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]

diff --git a/CHANGELOG.md b/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)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "private": true,
   "description": "CodeQL action",
   "scripts": {