Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into v1 #585

Merged
merged 29 commits into from
Jun 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
2a9a602
Upload databases from analyze action
robertbrignull Jun 10, 2021
4294711
Update cleanup to bundle
rneatherway Jun 10, 2021
d693b3c
Check if on default branch before uploading database
robertbrignull Jun 16, 2021
366b68e
Merge pull request #563 from github/robertbrignull/check_default_branch
robertbrignull Jun 16, 2021
c989ee7
Provide a better error message
robertbrignull Jun 16, 2021
b985a67
Only attempt to upload on dotcom
robertbrignull Jun 16, 2021
6fc1280
Merge pull request #564 from github/robertbrignull/workflow_event_error
robertbrignull Jun 17, 2021
69c30da
Merge pull request #565 from github/robertbrignull/upload_ghes
robertbrignull Jun 17, 2021
b4914d7
Add a CODEOWNERS file
aeisenberg Jun 17, 2021
9c28349
Merge branch 'main' into aeisenberg/add-codeowners
aeisenberg Jun 17, 2021
c35646f
Update changelog and version after v1.0.2
invalid-email-address Jun 17, 2021
4954c37
1.0.3
invalid-email-address Jun 17, 2021
6a7c236
Merge pull request #569 from github/aeisenberg/add-codeowners
aeisenberg Jun 17, 2021
33ac512
Merge branch 'main' into upload-database
robertbrignull Jun 18, 2021
f3cd5fa
Add workflow input to disable uploads
robertbrignull Jun 18, 2021
f6d1bad
Merge pull request #573 from github/upload-database
robertbrignull Jun 21, 2021
d893508
Revert "Upload CodeQL databases"
robertbrignull Jun 21, 2021
dbc4fda
Merge pull request #577 from github/revert-573-upload-database
robertbrignull Jun 21, 2021
b2e7277
Merge branch 'main' into mergeback/v1.0.2-to-main-37f75f17
aeisenberg Jun 21, 2021
b2d10b3
Merge pull request #571 from github/mergeback/v1.0.2-to-main-37f75f17
aeisenberg Jun 21, 2021
146c897
Upload CodeQL databases
robertbrignull Jun 22, 2021
00791d5
remove old lib file
robertbrignull Jun 22, 2021
8d50a5f
Update CodeQL bundle to 20210622 / 2.5.6
hmakholm Jun 22, 2021
171619a
Merge pull request #578 from github/upload-database
robertbrignull Jun 22, 2021
1cd2cd1
Merge branch 'main' into hmakholm/pr/2.5.6
henrymercer Jun 22, 2021
9821b8c
Merge pull request #582 from github/hmakholm/pr/2.5.6
hmakholm Jun 22, 2021
629f582
Update changelog template
aeisenberg Jun 22, 2021
d623a7a
Merge pull request #583 from github/aeisenberg/changelog-template
aeisenberg Jun 22, 2021
a12bb22
1.0.3
invalid-email-address Jun 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/update-release-branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@

## [UNRELEASED]

No user facing changes.

"""

# The branch being merged from.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-release-mergeback.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
PR_BODY="Updates version and changelog."

# Update the changelog
perl -i -pe 's/^/## \[UNRELEASED\]\n\n/ if($.==3)' CHANGELOG.md
perl -i -pe 's/^/## \[UNRELEASED\]\n\nNo user facing changes.\n\n/ if($.==3)' CHANGELOG.md
git add .
git commit -m "Update changelog and version after $VERSION"
npm version patch
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CodeQL Action and CodeQL Runner Changelog

## 1.0.3 - 23 Jun 2021

No user facing changes.

## 1.0.2 - 17 Jun 2021

- Fix out of memory in hash computation. [#550](https://github.com/github/codeql-action/pull/550)
Expand Down
1 change: 1 addition & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/* @github/codeql-action-reviewers
4 changes: 4 additions & 0 deletions analyze/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ inputs:
category:
description: String used by Code Scanning for matching the analyses
required: false
upload-database:
description: Whether to upload the resulting CodeQL database
required: false
default: "true"
token:
default: ${{ github.token }}
matrix:
Expand Down
30 changes: 25 additions & 5 deletions lib/actions-util.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/actions-util.js.map

Large diffs are not rendered by default.

26 changes: 23 additions & 3 deletions lib/actions-util.test.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading