From 8833977736bdf06f2c5fe043d8843f04fdc20b19 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Mar 2022 09:58:37 +0000 Subject: [PATCH 1/5] Update changelog for v2.1.6 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91973383ca..ef29d52468 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # CodeQL Action Changelog -## [UNRELEASED] +## 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) From 34a1681e50b69fc91edc2dd3ef44ecfeaa355de9 Mon Sep 17 00:00:00 2001 From: Edoardo Pirovano Date: Wed, 30 Mar 2022 11:11:17 +0100 Subject: [PATCH 2/5] Fix location of changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef29d52468..3fe955fe80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [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 +22,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 From a4da970395c86e7498d7e743839cef618132fc32 Mon Sep 17 00:00:00 2001 From: Edoardo Pirovano Date: Wed, 30 Mar 2022 11:47:41 +0100 Subject: [PATCH 3/5] Run workflow also on `v2` branch --- .github/workflows/codeql.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 320a790e89..66a0bfd795 100644 --- a/.github/workflows/codeql.yml +++ b/.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] From ee3341a9d8da99c6b64c95b980b3105142e923a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Mar 2022 11:13:37 +0000 Subject: [PATCH 4/5] Update changelog and version after v2.1.6 --- CHANGELOG.md | 4 ++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fe955fe80..b630d44cf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CodeQL Action Changelog +## [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) diff --git a/package-lock.json b/package-lock.json index 552ecf431f..ed69d98243 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codeql", - "version": "2.1.6", + "version": "2.1.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "codeql", - "version": "2.1.6", + "version": "2.1.7", "license": "MIT", "dependencies": { "@actions/artifact": "^1.0.0", diff --git a/package.json b/package.json index 140d3332f9..44bf05e842 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "2.1.6", + "version": "2.1.7", "private": true, "description": "CodeQL action", "scripts": { From bcd5c027ded696d81a7087a237ca9989c2a99de4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Mar 2022 11:55:38 +0000 Subject: [PATCH 5/5] Update checked-in dependencies --- node_modules/.package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 95b2913b35..03c63148c8 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1,6 +1,6 @@ { "name": "codeql", - "version": "2.1.6", + "version": "2.1.7", "lockfileVersion": 2, "requires": true, "packages": {