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 releases/v2 #1129

Merged
merged 25 commits into from Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1653a84
Allow scans with packs for languages not being scanned
aeisenberg Jun 22, 2022
f9fd90e
Update changelog and version after v2.1.14
invalid-email-address Jun 22, 2022
3b151b1
Update checked-in dependencies
invalid-email-address Jun 23, 2022
a965b69
Merge pull request #1118 from github/mergeback/v2.1.14-to-main-41a4ada3
aeisenberg Jun 23, 2022
7fa4dc3
Fix dependabot warnings in runner
aeisenberg Jun 23, 2022
c699821
Update runner dependencies
aeisenberg Jun 23, 2022
4efa7d6
Merge pull request #1119 from github/aeisenberg/runner-dependabot-fix
aeisenberg Jun 24, 2022
8bfe3c6
Disable python2 + poetry
aeisenberg Jun 24, 2022
c18b1d6
Update changelog
aeisenberg Jun 24, 2022
934c034
Update CHANGELOG.md
aeisenberg Jun 24, 2022
c08ab55
Merge branch 'main' into aeisenberg/poetry-python2
aeisenberg Jun 24, 2022
e041151
Update CHANGELOG.md
aeisenberg Jun 24, 2022
b38dc80
Merge branch 'main' into aeisenberg/multi-lang-packs
aeisenberg Jun 24, 2022
7c4d0e0
Merge pull request #1124 from github/aeisenberg/poetry-python2
aeisenberg Jun 24, 2022
b9deefb
Merge branch 'main' into aeisenberg/multi-lang-packs
aeisenberg Jun 24, 2022
47bcabd
Merge pull request #1116 from github/aeisenberg/multi-lang-packs
aeisenberg Jun 24, 2022
ed40e30
Update default CodeQL version to 2.10.0
cklin Jun 24, 2022
f422a50
Honor the Lua tracer FF for `database trace-command` invocations for …
criemen Jun 24, 2022
ab7316e
Implement unit tests for reading the Lua tracer FF in analyze-action.
criemen Jun 27, 2022
37d8b51
Merge pull request #1123 from github/cklin/codeql-cli-2.10.0
cklin Jun 27, 2022
821fe9b
Merge branch 'main' into criemen/lua-tracer-ff-2
criemen Jun 28, 2022
b40cd03
Merge pull request #1120 from github/criemen/lua-tracer-ff-2
criemen Jun 28, 2022
1616e0e
Simplify tests for the Lua tracer FF in analyze-action.
criemen Jun 28, 2022
e8c48cc
Merge pull request #1128 from github/criemen/lua-tracer-ff-2
criemen Jun 28, 2022
26a6980
Update changelog for v2.1.15
invalid-email-address Jun 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/workflows/python-deps.yml
Expand Up @@ -18,6 +18,11 @@ jobs:
os: [ubuntu-latest, macos-latest]
python_deps_type: [pipenv, poetry, requirements, setup_py]
python_version: [2, 3]
exclude:
# Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374
- python_version: 2
python_deps_type: poetry


env:
PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}
Expand Down Expand Up @@ -115,6 +120,10 @@ jobs:
matrix:
python_deps_type: [pipenv, poetry, requirements, setup_py]
python_version: [2, 3]
exclude:
# Python2 and poetry are not supported. See https://github.com/actions/setup-python/issues/374
- python_version: 2
python_deps_type: poetry

env:
PYTHON_DEPS_TYPE: ${{ matrix.python_deps_type }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,11 @@
# CodeQL Action Changelog

## 2.1.15 - 28 Jun 2022

- CodeQL query packs listed in the `packs` configuration field will be skipped if their target language is not being analyzed in the current Actions job. Previously, this would throw an error. [#1116](https://github.com/github/codeql-action/pull/1116)
- The combination of python2 and poetry is no longer supported. See https://github.com/actions/setup-python/issues/374 for more details. [#1124](https://github.com/github/codeql-action/pull/1124)
- Update default CodeQL bundle version to 2.10.0. [#1123](https://github.com/github/codeql-action/pull/1123)

## 2.1.14 - 22 Jun 2022

No user facing changes.
Expand Down
6 changes: 5 additions & 1 deletion lib/analyze-action.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/analyze-action.js.map

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions lib/analyze.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/analyze.js.map

Large diffs are not rendered by default.

70 changes: 70 additions & 0 deletions lib/analyze.test.js

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