Merge remote-tracking branch 'upstream/v1' into aeisenberg/mergeback-fix

github · May 31, 2021 · 7d701d2 · 7d701d2
2 parents 981b5cb + 4917d3c
commit 7d701d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/update-release-branch.py b/.github/update-release-branch.py
@@ -8,8 +8,7 @@
 import datetime
 import os
 
-EMPTY_CHANGELOG = """
-# CodeQL Action and CodeQL Runner Changelog
+EMPTY_CHANGELOG = """# CodeQL Action and CodeQL Runner Changelog
 
 ## [UNRELEASED]
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CodeQL Action and CodeQL Runner Changelog
 
-## [UNRELEASED]
+## 1.0.0 - 31 May 2021
 
 - Add this changelog file. [#507](https://github.com/github/codeql-action/pull/507)
 - Improve grouping of analysis logs. Add a new log group containing a summary of metrics and diagnostics, if they were produced by CodeQL builtin queries. [#515](https://github.com/github/codeql-action/pull/515)