diff --git a/.github/workflows/check-for-conflicts.yml b/.github/workflows/check-for-conflicts.yml
index fdd04120de..fe96d9ac3b 100644
--- 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
index b4585b6fcb..51a9b378f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
No user facing changes.
+## 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
index b0751b0a30..796f70b371 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
{
"name": "codeql",
- "version": "2.1.14",
+ "version": "2.1.15",
"lockfileVersion": 2,
"requires": true,
"packages": {
diff --git a/package-lock.json b/package-lock.json
index 3eba435cdd..1827137523 100644
--- a/package-lock.json
+++ b/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",
diff --git a/package.json b/package.json
index 6f68646523..80ded6aea3 100644
--- 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": {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy