diff --git a/.github/workflows/check-for-conflicts.yml b/.github/workflows/check-for-conflicts.yml index fdd04120d..fe96d9ac3 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 b4585b6fc..51a9b378f 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 b0751b0a3..796f70b37 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 3eba435cd..182713752 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 6f6864652..80ded6aea 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": {