Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b38dc80

Browse files
authored
Merge branch 'main' into aeisenberg/multi-lang-packs
2 parents e041151 + 4efa7d6 commit b38dc80

7 files changed

Lines changed: 2963 additions & 164 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Check for conflicts
44

55
on:
66
pull_request:
7-
branches: [main, v1, v2]
7+
branches: [main, releases/v1, releases/v2]
88
# Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
99
# by other workflows.
1010
types: [opened, synchronize, reopened, ready_for_review]

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
- 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)
66

7+
## 2.1.14 - 22 Jun 2022
8+
9+
No user facing changes.
10+
711
## 2.1.13 - 21 Jun 2022
812

913
- Update default CodeQL bundle version to 2.9.4. [#1100](https://github.com/github/codeql-action/pull/1100)

node_modules/.package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "codeql",
3-
"version": "2.1.14",
3+
"version": "2.1.15",
44
"private": true,
55
"description": "CodeQL action",
66
"scripts": {

0 commit comments

Comments
 (0)