Skip to content

Commit 2756b60

Browse files
GeekMasherGeekMasher
authored
Merge pull request #89 from GitHubSecurityLab/runcionworkflowchange
Update CodeQL CLI to 2.19.3 and fix code issues.
2 parents d3871a8 + d7a0a29 commit 2756b60

Some content is hidden

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

48 files changed

+556
-457
lines changed

‎.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77

88
env:
9-
CODEQL_CLI_VERSION: 2.19.2
9+
CODEQL_CLI_VERSION: 2.19.3
1010

1111
jobs:
1212
compile-and-test:
@@ -27,6 +27,7 @@ jobs:
2727
filters: |
2828
src:
2929
- '${{ matrix.language }}/**'
30+
- '.github/**'
3031
3132
- name: Setup CodeQL
3233
if: steps.changes.outputs.src == 'true'
@@ -38,9 +39,9 @@ jobs:
3839
if: steps.changes.outputs.src == 'true'
3940
env:
4041
GITHUB_TOKEN: ${{ github.token }}
42+
CODEQL_CLI_VERSION: ${{ env.CODEQL_CLI_VERSION }}
4143
run: |
42-
gh repo clone github/codeql # to make stubs available for tests
43-
codeql pack download "codeql/${{ matrix.language }}-queries"
44+
gh repo clone github/codeql -- -b codeql-cli-${CODEQL_CLI_VERSION} # to make stubs available for tests
4445
codeql pack install "${{ matrix.language }}/lib"
4546
codeql pack install "${{ matrix.language }}/src"
4647
codeql pack install "${{ matrix.language }}/test"

‎cpp/lib/codeql-pack.lock.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.2
5+
version: 2.1.0
66
codeql/dataflow:
7-
version: 0.0.3
7+
version: 1.1.5
8+
codeql/mad:
9+
version: 1.0.11
10+
codeql/rangeanalysis:
11+
version: 1.0.11
812
codeql/ssa:
9-
version: 0.1.4
13+
version: 1.0.11
1014
codeql/tutorial:
11-
version: 0.1.4
15+
version: 1.0.11
16+
codeql/typeflow:
17+
version: 1.0.11
18+
codeql/typetracking:
19+
version: 1.0.11
1220
codeql/util:
13-
version: 0.1.4
21+
version: 1.0.11
22+
codeql/xml:
23+
version: 1.0.11
1424
compiled: false

‎cpp/src/codeql-pack.lock.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.2
5+
version: 2.1.0
66
codeql/cpp-queries:
7-
version: 0.7.4
7+
version: 1.2.6
88
codeql/dataflow:
9-
version: 0.0.3
9+
version: 1.1.5
10+
codeql/mad:
11+
version: 1.0.11
12+
codeql/rangeanalysis:
13+
version: 1.0.11
1014
codeql/ssa:
11-
version: 0.1.4
15+
version: 1.0.11
1216
codeql/suite-helpers:
13-
version: 0.6.4
17+
version: 1.0.11
1418
codeql/tutorial:
15-
version: 0.1.4
19+
version: 1.0.11
20+
codeql/typeflow:
21+
version: 1.0.11
22+
codeql/typetracking:
23+
version: 1.0.11
1624
codeql/util:
17-
version: 0.1.4
25+
version: 1.0.11
26+
codeql/xml:
27+
version: 1.0.11
1828
compiled: false

‎cpp/test/codeql-pack.lock.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/cpp-all:
5-
version: 0.9.2
5+
version: 2.1.0
66
codeql/cpp-queries:
7-
version: 0.7.4
7+
version: 1.2.6
88
codeql/dataflow:
9-
version: 0.0.3
9+
version: 1.1.5
10+
codeql/mad:
11+
version: 1.0.11
12+
codeql/rangeanalysis:
13+
version: 1.0.11
1014
codeql/ssa:
11-
version: 0.1.4
15+
version: 1.0.11
1216
codeql/suite-helpers:
13-
version: 0.6.4
17+
version: 1.0.11
1418
codeql/tutorial:
15-
version: 0.1.4
19+
version: 1.0.11
20+
codeql/typeflow:
21+
version: 1.0.11
22+
codeql/typetracking:
23+
version: 1.0.11
1624
codeql/util:
17-
version: 0.1.4
25+
version: 1.0.11
26+
codeql/xml:
27+
version: 1.0.11
1828
compiled: false

‎csharp/lib/codeql-pack.lock.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/controlflow:
5-
version: 1.0.10
5+
version: 1.0.11
66
codeql/csharp-all:
7-
version: 3.0.1
7+
version: 3.1.0
88
codeql/dataflow:
9-
version: 1.1.4
9+
version: 1.1.5
1010
codeql/mad:
11-
version: 1.0.10
11+
version: 1.0.11
1212
codeql/ssa:
13-
version: 1.0.10
13+
version: 1.0.11
1414
codeql/threat-models:
15-
version: 1.0.10
15+
version: 1.0.11
1616
codeql/tutorial:
17-
version: 1.0.10
17+
version: 1.0.11
1818
codeql/typetracking:
19-
version: 1.0.10
19+
version: 1.0.11
2020
codeql/util:
21-
version: 1.0.10
21+
version: 1.0.11
2222
codeql/xml:
23-
version: 1.0.10
23+
version: 1.0.11
2424
compiled: false

‎csharp/src/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/controlflow:
5-
version: 1.0.10
5+
version: 1.0.11
66
codeql/csharp-all:
7-
version: 3.0.1
7+
version: 3.1.0
88
codeql/csharp-queries:
9-
version: 1.0.10
9+
version: 1.0.11
1010
codeql/dataflow:
11-
version: 1.1.4
11+
version: 1.1.5
1212
codeql/mad:
13-
version: 1.0.10
13+
version: 1.0.11
1414
codeql/ssa:
15-
version: 1.0.10
15+
version: 1.0.11
1616
codeql/suite-helpers:
17-
version: 1.0.10
17+
version: 1.0.11
1818
codeql/threat-models:
19-
version: 1.0.10
19+
version: 1.0.11
2020
codeql/tutorial:
21-
version: 1.0.10
21+
version: 1.0.11
2222
codeql/typetracking:
23-
version: 1.0.10
23+
version: 1.0.11
2424
codeql/util:
25-
version: 1.0.10
25+
version: 1.0.11
2626
codeql/xml:
27-
version: 1.0.10
27+
version: 1.0.11
2828
compiled: false

‎csharp/test/TestUtilities/PrettyPrintModels.ql

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,3 @@
55
import semmle.code.csharp.dataflow.internal.ExternalFlow
66
import codeql.dataflow.test.ProvenancePathGraph
77
import codeql.dataflow.test.ProvenancePathGraph::TestPostProcessing::TranslateProvenanceResults<interpretModelForTest/2>
8-
9-
from string relation, int row, int column, string data
10-
where results(relation, row, column, data)
11-
select relation, row, column, data

‎csharp/test/codeql-pack.lock.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/controlflow:
5-
version: 1.0.10
5+
version: 1.0.11
66
codeql/csharp-all:
7-
version: 3.0.1
7+
version: 3.1.0
88
codeql/csharp-queries:
9-
version: 1.0.10
9+
version: 1.0.11
1010
codeql/dataflow:
11-
version: 1.1.4
11+
version: 1.1.5
1212
codeql/mad:
13-
version: 1.0.10
13+
version: 1.0.11
1414
codeql/ssa:
15-
version: 1.0.10
15+
version: 1.0.11
1616
codeql/suite-helpers:
17-
version: 1.0.10
17+
version: 1.0.11
1818
codeql/threat-models:
19-
version: 1.0.10
19+
version: 1.0.11
2020
codeql/tutorial:
21-
version: 1.0.10
21+
version: 1.0.11
2222
codeql/typetracking:
23-
version: 1.0.10
23+
version: 1.0.11
2424
codeql/util:
25-
version: 1.0.10
25+
version: 1.0.11
2626
codeql/xml:
27-
version: 1.0.10
27+
version: 1.0.11
2828
compiled: false

‎go/lib/codeql-pack.lock.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/dataflow:
5-
version: 0.2.7
5+
version: 1.1.5
66
codeql/go-all:
7-
version: 0.8.1
7+
version: 2.1.2
88
codeql/mad:
9-
version: 0.2.16
9+
version: 1.0.11
1010
codeql/ssa:
11-
version: 0.2.16
11+
version: 1.0.11
12+
codeql/threat-models:
13+
version: 1.0.11
1214
codeql/tutorial:
13-
version: 0.2.16
15+
version: 1.0.11
1416
codeql/typetracking:
15-
version: 0.2.16
17+
version: 1.0.11
1618
codeql/util:
17-
version: 0.2.16
19+
version: 1.0.11
1820
compiled: false

‎go/src/codeql-pack.lock.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
lockVersion: 1.0.0
33
dependencies:
44
codeql/dataflow:
5-
version: 0.2.7
5+
version: 1.1.5
66
codeql/go-all:
7-
version: 0.8.1
7+
version: 2.1.2
88
codeql/mad:
9-
version: 0.2.16
9+
version: 1.0.11
1010
codeql/ssa:
11-
version: 0.2.16
11+
version: 1.0.11
12+
codeql/threat-models:
13+
version: 1.0.11
1214
codeql/tutorial:
13-
version: 0.2.16
15+
version: 1.0.11
1416
codeql/typetracking:
15-
version: 0.2.16
17+
version: 1.0.11
1618
codeql/util:
17-
version: 0.2.16
19+
version: 1.0.11
1820
compiled: false

0 commit comments

Comments
 (0)