hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ruby: Rename extractor to codeql-extractor-ruby

Browse Source
This commit is contained in:
Harry Maclean
2023-04-19 06:27:27 +00:00
parent 8691845d23
commit ab4eba11ec
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/ruby-build.yml vendored
View File

@@ -58,8 +58,8 @@ jobs:
id: cache-extractor id: cache-extractor
with: with:
path: | path: |
ruby/extractor/target/release/codeql-ruby-extractor ruby/extractor/target/release/codeql-extractor-ruby
ruby/extractor/target/release/codeql-ruby-extractor.exe ruby/extractor/target/release/codeql-extractor-ruby.exe
ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }} key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }}
- uses: actions/cache@v3 - uses: actions/cache@v3
@@ -86,13 +86,13 @@ jobs:
run: | run: |
cd extractor cd extractor
cross build --release cross build --release
mv target/x86_64-unknown-linux-gnu/release/codeql-ruby-extractor target/release/ mv target/x86_64-unknown-linux-gnu/release/codeql-extractor-ruby target/release/
- name: Release build (windows and macos) - name: Release build (windows and macos)
if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux' if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux'
run: cd extractor && cargo build --release run: cd extractor && cargo build --release
- name: Generate dbscheme - name: Generate dbscheme
if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}} if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}}
run: extractor/target/release/codeql-ruby-extractor generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll run: extractor/target/release/codeql-extractor-ruby generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
if: ${{ matrix.os == 'ubuntu-latest' }} if: ${{ matrix.os == 'ubuntu-latest' }}
with: with:
@@ -107,8 +107,8 @@ jobs:
with: with:
name: extractor-${{ matrix.os }} name: extractor-${{ matrix.os }}
path: | path: |
ruby/extractor/target/release/codeql-ruby-extractor ruby/extractor/target/release/codeql-extractor-ruby
ruby/extractor/target/release/codeql-ruby-extractor.exe ruby/extractor/target/release/codeql-extractor-ruby.exe
retention-days: 1 retention-days: 1
compile-queries: compile-queries:
runs-on: ubuntu-latest-xl runs-on: ubuntu-latest-xl
@@ -166,9 +166,9 @@ jobs:
mkdir -p ruby mkdir -p ruby
cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/ cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/
mkdir -p ruby/tools/{linux64,osx64,win64} mkdir -p ruby/tools/{linux64,osx64,win64}
cp linux64/codeql-ruby-extractor ruby/tools/linux64/extractor cp linux64/codeql-extractor-ruby ruby/tools/linux64/extractor
cp osx64/codeql-ruby-extractor ruby/tools/osx64/extractor cp osx64/codeql-extractor-ruby ruby/tools/osx64/extractor
cp win64/codeql-ruby-extractor.exe ruby/tools/win64/extractor.exe cp win64/codeql-extractor-ruby.exe ruby/tools/win64/extractor.exe
chmod +x ruby/tools/{linux64,osx64}/extractor chmod +x ruby/tools/{linux64,osx64}/extractor
zip -rq codeql-ruby.zip ruby zip -rq codeql-ruby.zip ruby
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3

8
ruby/Makefile
View File

@@ -24,7 +24,7 @@ FILES=codeql-extractor.yml\
ql/lib/ruby.dbscheme.stats\ ql/lib/ruby.dbscheme.stats\
ql/lib/ruby.dbscheme ql/lib/ruby.dbscheme
BIN_FILES=target/release/codeql-ruby-extractor$(EXE) BIN_FILES=target/release/codeql-extractor-ruby$(EXE)
extractor-common: extractor-common:
rm -rf build rm -rf build
@@ -37,14 +37,14 @@ extractor-common:
tools: $(BIN_FILES) tools: $(BIN_FILES)
rm -rf tools/bin rm -rf tools/bin
mkdir tools/bin mkdir tools/bin
cp -r target/release/codeql-ruby-extractor$(EXE) tools/bin/extractor$(EXE) cp -r target/release/codeql-extractor-ruby$(EXE) tools/bin/extractor$(EXE)
target/release/%$(EXE): target/release/%$(EXE):
cd extractor && cargo build --release cd extractor && cargo build --release
dbscheme: dbscheme:
cd extractor && cargo build --release cd extractor && cargo build --release
extractor/target/release/codeql-ruby-extractor generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll extractor/target/release/codeql-extractor-ruby generate --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 codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
.PHONY: extractor .PHONY: extractor
@@ -62,7 +62,7 @@ extractor: $(FILES) $(BIN_FILES)
cp tools/autobuild.cmd extractor-pack/tools/autobuild.cmd cp tools/autobuild.cmd extractor-pack/tools/autobuild.cmd
cp ql/lib/ruby.dbscheme.stats extractor-pack/ruby.dbscheme.stats cp ql/lib/ruby.dbscheme.stats extractor-pack/ruby.dbscheme.stats
cp ql/lib/ruby.dbscheme extractor-pack/ruby.dbscheme cp ql/lib/ruby.dbscheme extractor-pack/ruby.dbscheme
cp extractor/target/release/codeql-ruby-extractor$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE) cp extractor/target/release/codeql-extractor-ruby$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
test: extractor dbscheme test: extractor dbscheme
codeql test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path extractor-pack --consistency-queries ql/consistency-queries ql/test codeql test run --check-databases --check-unused-labels --check-repeated-labels --check-redefined-labels --check-use-before-definition --search-path extractor-pack --consistency-queries ql/consistency-queries ql/test

BIN
ruby/extractor/Cargo.lock generated
View File

Binary file not shown.

2
ruby/extractor/Cargo.toml
View File

@@ -1,5 +1,5 @@
[package] [package]
name = "codeql-ruby-extractor" name = "codeql-extractor-ruby"
description = "CodeQL Ruby extractor" description = "CodeQL Ruby extractor"
version = "0.1.0" version = "0.1.0"
authors = ["GitHub"] authors = ["GitHub"]

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

@@ -2,7 +2,7 @@ cd extractor
cargo build --release cargo build --release
cd .. cd ..
extractor\target\release\codeql-ruby-extractor -- generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll extractor\target\release\codeql-extractor-ruby -- generate --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 codeql query format -i ql\lib\codeql/ruby\ast\internal\TreeSitter.qll
@@ -12,4 +12,4 @@ cp codeql-extractor.yml, ql\lib\ruby.dbscheme, ql\lib\ruby.dbscheme.stats extrac
cp -Recurse tools extractor-pack cp -Recurse tools extractor-pack
cp -Recurse downgrades extractor-pack cp -Recurse downgrades extractor-pack
mkdir extractor-pack\tools\win64 | Out-Null mkdir extractor-pack\tools\win64 | Out-Null
cp extractor\target\release\codeql-ruby-extractor.exe extractor-pack\tools\win64\extractor.exe cp extractor\target\release\codeql-extractor-ruby.exe extractor-pack\tools\win64\extractor.exe

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

@@ -22,7 +22,7 @@ if [[ "$CARGO" == "cross" ]]; then
BIN_DIR=extractor/target/x86_64-unknown-linux-gnu/release BIN_DIR=extractor/target/x86_64-unknown-linux-gnu/release
fi fi
"$BIN_DIR/codeql-ruby-extractor" generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll "$BIN_DIR/codeql-extractor-ruby" generate --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 codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
@@ -30,4 +30,4 @@ rm -rf extractor-pack
mkdir -p extractor-pack mkdir -p extractor-pack
cp -r codeql-extractor.yml downgrades tools ql/lib/ruby.dbscheme ql/lib/ruby.dbscheme.stats extractor-pack/ cp -r codeql-extractor.yml downgrades tools ql/lib/ruby.dbscheme ql/lib/ruby.dbscheme.stats extractor-pack/
mkdir -p extractor-pack/tools/${platform} mkdir -p extractor-pack/tools/${platform}
cp "$BIN_DIR/codeql-ruby-extractor" extractor-pack/tools/${platform}/extractor cp "$BIN_DIR/codeql-extractor-ruby" extractor-pack/tools/${platform}/extractor