Merge pull request #1005 from github/mergeback/v2.1.6-to-main-28eead24

Mergeback v2.1.6 refs/heads/v2 into main

.github/workflows/codeql.yml

@@ -2,9 +2,9 @@ name: "CodeQL action"
 
 on:
   push:
-    branches: [main, v1]
+    branches: [main, v1, v2]
   pull_request:
-    branches: [main, v1]
+    branches: [main, v1, 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

@@ -2,8 +2,13 @@
 
 ## [UNRELEASED]
 
+No user facing changes.
+
+## 2.1.6 - 30 Mar 2022
+
 - [v2+ only] The CodeQL Action now runs on Node.js v16. [#1000](https://github.com/github/codeql-action/pull/1000)
 - Update default CodeQL bundle version to 2.8.4. [#990](https://github.com/github/codeql-action/pull/990)
+- Fix a bug where an invalid `commit_oid` was being sent to code scanning when a custom checkout path was being used. [#956](https://github.com/github/codeql-action/pull/956)
 
 ## 1.1.5 - 15 Mar 2022
 
@@ -21,7 +26,6 @@
 ## 1.1.3 - 23 Feb 2022
 
 - Fix a bug where the CLR traces can continue tracing even after tracing should be stopped. [#938](https://github.com/github/codeql-action/pull/938)
-- Fix a bug where an invalid `commit_oid` was being sent to code scanning when a custom checkout path was being used. [#956](https://github.com/github/codeql-action/pull/956)
 
 ## 1.1.2 - 17 Feb 2022
 

package.json

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