Skip to content

Commit ccc6291

Browse files
committed
Merge rc/3.3 into rc/3.4
Conflicts in *-support.rst resolved in favour of rc/3.3, which has a new paragraph. Enterprise version numbers updated to LGTM Enterprise 1.30 and CodeQL 2.7.6.
2 parents 9e51908 + e178626 commit ccc6291

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

docs/codeql/support/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
# The short X.Y version.
4444

4545
# LGTM Enterprise release
46-
release = u'1.28'
46+
release = u'1.30'
4747

4848
# CodeQL CLI version used by LGTM Enterprise release
49-
version = u'2.5.9'
49+
version = u'2.7.6'
5050

5151
# -- Project-specifc options for HTML output ----------------------------------------------
5252

docs/codeql/support/framework-support.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Frameworks and libraries
33

44
LGTM Enterprise |release| includes CodeQL CLI |version|. The CodeQL libraries and queries used by this version of LGTM Enterprise have been explicitly checked against the libraries and frameworks listed below.
55

6+
.. pull-quote::
7+
8+
Note
9+
10+
For details of framework and library support in the most recent release of the CodeQL CLI, see `Supported languages and frameworks <https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/>`__ in the CodeQL CLI documentation.
11+
612
.. pull-quote::
713

814
Tip

docs/codeql/support/language-support.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ Languages and compilers
33

44
LGTM Enterprise |release| includes CodeQL CLI |version|. LGTM Enterprise supports analysis of the following languages compiled by the following compilers.
55

6+
.. pull-quote::
7+
8+
Note
9+
10+
For details of language and compiler support in the most recent release of the CodeQL CLI, see `Supported languages and frameworks <https://codeql.github.com/docs/codeql-overview/supported-languages-and-frameworks/>`__ in the CodeQL CLI documentation.
11+
612
Note that where there are several versions or dialects of a language, the supported variants are listed.
713
If your code requires a particular version of a compiler, check that this version is included below.
814
If you have any questions about language and compiler support, you can find help on the `GitHub Security Lab discussions board <https://github.com/github/securitylab/discussions>`__.

0 commit comments

Comments
 (0)