Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 27fcc90

Browse files
erik-krogherik-krogh
committed
Merge branch 'main' into msgConsis
2 parents a50234a + 18ed9ed commit 27fcc90

306 files changed

Lines changed: 14238 additions & 3496 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/labeler.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ documentation:
4242

4343
"QL-for-QL":
4444
- ql/**/*
45+
- .github/workflows/ql-for-ql*

‎.github/workflows/ql-for-ql-build.yml‎

Lines changed: 34 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,37 @@ jobs:
2727
shell: bash
2828
env:
2929
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
30+
- name: Cache entire pack
31+
id: cache-pack
32+
uses: actions/cache@v3
33+
with:
34+
path: ${{ runner.temp }}/pack
35+
key: ${{ runner.os }}-pack-${{ hashFiles('ql/**/Cargo.lock') }}-${{ hashFiles('ql/**/*.rs') }}-${{ hashFiles('ql/**/*.ql*') }}-${{ hashFiles('ql/**/qlpack.yml') }}-${{ hashFiles('ql/ql/src/ql.dbscheme*') }}-${{ steps.get-codeql-version.outputs.version }}--${{ hashFiles('.github/workflows/ql-for-ql-build.yml') }}
3036
- name: Cache queries
37+
if: steps.cache-pack.outputs.cache-hit != 'true'
3138
id: cache-queries
3239
uses: actions/cache@v3
3340
with:
34-
path: ${{ runner.temp }}/query-pack.zip
41+
path: ${{ runner.temp }}/queries
3542
key: queries-${{ hashFiles('ql/**/*.ql*') }}-${{ hashFiles('ql/**/qlpack.yml') }}-${{ hashFiles('ql/ql/src/ql.dbscheme*') }}-${{ steps.get-codeql-version.outputs.version }}--${{ hashFiles('.github/workflows/ql-for-ql-build.yml') }}
3643
- name: Build query pack
37-
if: steps.cache-queries.outputs.cache-hit != 'true'
44+
if: steps.cache-queries.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
3845
run: |
3946
cd ql/ql/src
4047
"${CODEQL}" pack create -j 16
41-
cd .codeql/pack/codeql/ql/0.0.0
42-
zip "${PACKZIP}" -r .
43-
rm -rf *
48+
mv .codeql/pack/codeql/ql/0.0.0 ${{ runner.temp }}/queries
4449
env:
4550
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
46-
PACKZIP: ${{ runner.temp }}/query-pack.zip
47-
- name: Upload query pack
48-
uses: actions/upload-artifact@v3
49-
with:
50-
name: query-pack-zip
51-
path: ${{ runner.temp }}/query-pack.zip
52-
51+
- name: Move cache queries to pack
52+
if: steps.cache-pack.outputs.cache-hit != 'true'
53+
run: |
54+
cp -r ${{ runner.temp }}/queries ${{ runner.temp }}/pack
55+
env:
56+
CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
57+
5358
### Build the extractor ###
5459
- name: Cache entire extractor
60+
if: steps.cache-pack.outputs.cache-hit != 'true'
5561
id: cache-extractor
5662
uses: actions/cache@v3
5763
with:
@@ -62,7 +68,7 @@ jobs:
6268
ql/target/release/ql-extractor.exe
6369
key: ${{ runner.os }}-extractor-${{ hashFiles('ql/**/Cargo.lock') }}-${{ hashFiles('ql/**/*.rs') }}
6470
- name: Cache cargo
65-
if: steps.cache-extractor.outputs.cache-hit != 'true'
71+
if: steps.cache-extractor.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
6672
uses: actions/cache@v3
6773
with:
6874
path: |
@@ -71,73 +77,35 @@ jobs:
7177
ql/target
7278
key: ${{ runner.os }}-rust-cargo-${{ hashFiles('ql/**/Cargo.lock') }}
7379
- name: Check formatting
74-
if: steps.cache-extractor.outputs.cache-hit != 'true'
80+
if: steps.cache-extractor.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
7581
run: cd ql; cargo fmt --all -- --check
7682
- name: Build
77-
if: steps.cache-extractor.outputs.cache-hit != 'true'
83+
if: steps.cache-extractor.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
7884
run: cd ql; cargo build --verbose
7985
- name: Run tests
80-
if: steps.cache-extractor.outputs.cache-hit != 'true'
86+
if: steps.cache-extractor.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
8187
run: cd ql; cargo test --verbose
8288
- name: Release build
83-
if: steps.cache-extractor.outputs.cache-hit != 'true'
89+
if: steps.cache-extractor.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
8490
run: cd ql; cargo build --release
8591
- name: Generate dbscheme
86-
if: steps.cache-extractor.outputs.cache-hit != 'true'
92+
if: steps.cache-extractor.outputs.cache-hit != 'true' && steps.cache-pack.outputs.cache-hit != 'true'
8793
run: ql/target/release/ql-generator --dbscheme ql/ql/src/ql.dbscheme --library ql/ql/src/codeql_ql/ast/internal/TreeSitter.qll
88-
- uses: actions/upload-artifact@v3
89-
with:
90-
name: extractor-ubuntu-latest
91-
path: |
92-
ql/target/release/ql-autobuilder
93-
ql/target/release/ql-autobuilder.exe
94-
ql/target/release/ql-extractor
95-
ql/target/release/ql-extractor.exe
96-
retention-days: 1
9794

9895
### Package the queries and extractor ###
99-
- uses: actions/download-artifact@v3
100-
with:
101-
name: query-pack-zip
102-
path: query-pack-zip
103-
- uses: actions/download-artifact@v3
104-
with:
105-
name: extractor-ubuntu-latest
106-
path: linux64
107-
- run: |
108-
unzip query-pack-zip/*.zip -d pack
109-
cp -r ql/codeql-extractor.yml ql/tools ql/ql/src/ql.dbscheme.stats pack/
110-
mkdir -p pack/tools/linux64
111-
if [[ -f linux64/ql-autobuilder ]]; then
112-
cp linux64/ql-autobuilder pack/tools/linux64/autobuilder
113-
chmod +x pack/tools/linux64/autobuilder
114-
fi
115-
if [[ -f linux64/ql-extractor ]]; then
116-
cp linux64/ql-extractor pack/tools/linux64/extractor
117-
chmod +x pack/tools/linux64/extractor
118-
fi
119-
cd pack
120-
zip -rq ../codeql-ql.zip .
121-
rm -rf *
122-
- uses: actions/upload-artifact@v3
123-
with:
124-
name: codeql-ql-pack
125-
path: codeql-ql.zip
126-
retention-days: 1
127-
128-
### Run the analysis ###
129-
- name: Download pack
130-
uses: actions/download-artifact@v3
131-
with:
132-
name: codeql-ql-pack
133-
path: ${{ runner.temp }}/codeql-ql-pack-artifact
134-
135-
- name: Prepare pack
96+
- name: Package pack
97+
if: steps.cache-pack.outputs.cache-hit != 'true'
13698
run: |
137-
unzip "${PACK_ARTIFACT}/*.zip" -d "${PACK}"
99+
cp -r ql/codeql-extractor.yml ql/tools ql/ql/src/ql.dbscheme.stats ${PACK}/
100+
mkdir -p ${PACK}/tools/linux64
101+
cp ql/target/release/ql-autobuilder ${PACK}/tools/linux64/autobuilder
102+
cp ql/target/release/ql-extractor ${PACK}/tools/linux64/extractor
103+
chmod +x ${PACK}/tools/linux64/autobuilder
104+
chmod +x ${PACK}/tools/linux64/extractor
138105
env:
139-
PACK_ARTIFACT: ${{ runner.temp }}/codeql-ql-pack-artifact
140106
PACK: ${{ runner.temp }}/pack
107+
108+
### Run the analysis ###
141109
- name: Hack codeql-action options
142110
run: |
143111
JSON=$(jq -nc --arg pack "${PACK}" '.database."run-queries"=["--search-path", $pack] | .resolve.queries=["--search-path", $pack] | .resolve.extractor=["--search-path", $pack] | .database.init=["--search-path", $pack]')

‎java/documentation/library-coverage/coverage.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ java.beans,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
3434
java.io,37,,39,,15,,,,,,,,,,,,,,,,,,,,,,,,22,,,,,,,,39,
3535
java.lang,13,,58,,,,,,,,,,,8,,,,,4,,,1,,,,,,,,,,,,,,,46,12
3636
java.net,10,3,7,,,,,,,,,,,,,,10,,,,,,,,,,,,,,,,,,,3,7,
37-
java.nio,15,,6,,13,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,6,
37+
java.nio,15,,11,,13,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,11,
3838
java.sql,11,,,,,,,,,4,,,,,,,,,,,,,,,,7,,,,,,,,,,,,
3939
java.util,44,,461,,,,,,,,,,,34,,,,,,5,2,,1,2,,,,,,,,,,,,,36,425
4040
javax.faces.context,2,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,7,,

‎java/documentation/library-coverage/coverage.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ Java framework & library support
1515
`Apache HttpComponents <https://hc.apache.org/>`_,"``org.apache.hc.core5.*``, ``org.apache.http``",5,136,28,,,3,,,,25
1616
`Google Guava <https://guava.dev/>`_,``com.google.common.*``,,728,39,,6,,,,,
1717
`JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,,
18-
Java Standard Library,``java.*``,3,572,130,28,,,7,,,10
18+
Java Standard Library,``java.*``,3,577,130,28,,,7,,,10
1919
Java extensions,"``javax.*``, ``jakarta.*``",63,609,32,,,4,,1,1,2
2020
`Spring <https://spring.io/>`_,``org.springframework.*``,29,476,101,,,,19,14,,29
2121
Others,"``androidx.slice``, ``cn.hutool.core.codec``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.opensymphony.xwork2.ognl``, ``com.rabbitmq.client``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``groovy.lang``, ``groovy.util``, ``jodd.json``, ``kotlin.jvm.internal``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.apache.commons.codec``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.logging``, ``org.apache.commons.ognl``, ``org.apache.directory.ldap.client.api``, ``org.apache.ibatis.jdbc``, ``org.apache.log4j``, ``org.apache.logging.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.hibernate``, ``org.jboss.logging``, ``org.jdbi.v3.core``, ``org.jooq``, ``org.mvel2``, ``org.scijava.log``, ``org.slf4j``, ``org.xml.sax``, ``org.xmlpull.v1``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``",65,395,932,,,,14,18,,3
22-
Totals,,217,6433,1474,117,6,10,107,33,1,84
22+
Totals,,217,6438,1474,117,6,10,107,33,1,84
2323

0 commit comments

Comments
 (0)