hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-03 04:39:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts during rebase

Browse Source
This commit is contained in:
Arthur Baars
2021-08-11 16:17:09 +02:00
committed by Dave Bartolomeo
parent 0afcb9cc86
commit ac2c315839
115 changed files with 232 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/create-extractor-pack.ps1
View File

@@ -1,7 +1,7 @@
cargo build --release
cargo run --release -p ruby-generator -- --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
codeql query format -i ql\src\codeql_ruby\ast\internal\TreeSitter.qll
cargo run --release -p ruby-generator -- --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
codeql query format -i ql\src\codeql/ruby\ast\internal\TreeSitter.qll
rm -Recurse -Force extractor-pack
mkdir extractor-pack | Out-Null

4
scripts/create-extractor-pack.sh
View File

@@ -12,8 +12,8 @@ fi
cargo build --release
cargo run --release -p ruby-generator -- --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
codeql query format -i ql/lib/codeql_ruby/ast/internal/TreeSitter.qll
cargo run --release -p ruby-generator -- --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
rm -rf extractor-pack
mkdir -p extractor-pack

12
scripts/identical-files.json
View File

@@ -1,27 +1,27 @@
{
"SSA": [
"codeql/csharp/ql/src/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
"ql/lib/codeql_ruby/dataflow/internal/SsaImplCommon.qll"
"ql/lib/codeql/ruby/dataflow/internal/SsaImplCommon.qll"
],
"DataFlow Common": [
"codeql/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
"ql/lib/codeql_ruby/dataflow/internal/DataFlowImplCommon.qll"
"ql/lib/codeql/ruby/dataflow/internal/DataFlowImplCommon.qll"
],
"DataFlow": [
"codeql/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
"ql/lib/codeql_ruby/dataflow/internal/DataFlowImpl.qll"
"ql/lib/codeql/ruby/dataflow/internal/DataFlowImpl.qll"
],
"DataFlow Consistency": [
"codeql/csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
"ql/lib/codeql_ruby/dataflow/internal/DataFlowImplConsistency.qll"
"ql/lib/codeql/ruby/dataflow/internal/DataFlowImplConsistency.qll"
],
"TaintTracking": [
"codeql/csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
"ql/lib/codeql_ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
"ql/lib/codeql/ruby/dataflow/internal/tainttracking1/TaintTrackingImpl.qll"
],
"TypeTracker": [
"codeql/python/ql/src/semmle/python/dataflow/new/internal/TypeTracker.qll",
"ql/lib/codeql_ruby/typetracking/TypeTracker.qll"
"ql/lib/codeql/ruby/typetracking/TypeTracker.qll"
],
"Inline Test Expectations": [
"codeql/python/ql/test/TestUtilities/InlineExpectationsTest.qll",