Skip to content

Commit ab4eba1

Browse files
hmachmac
committed
Ruby: Rename extractor to codeql-extractor-ruby
1 parent 8691845 commit ab4eba1

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎.github/workflows/ruby-build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ jobs:
5858
id: cache-extractor
5959
with:
6060
path: |
61-
ruby/extractor/target/release/codeql-ruby-extractor
62-
ruby/extractor/target/release/codeql-ruby-extractor.exe
61+
ruby/extractor/target/release/codeql-extractor-ruby
62+
ruby/extractor/target/release/codeql-extractor-ruby.exe
6363
ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
6464
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }}
6565
- uses: actions/cache@v3
@@ -86,13 +86,13 @@ jobs:
8686
run: |
8787
cd extractor
8888
cross build --release
89-
mv target/x86_64-unknown-linux-gnu/release/codeql-ruby-extractor target/release/
89+
mv target/x86_64-unknown-linux-gnu/release/codeql-extractor-ruby target/release/
9090
- name: Release build (windows and macos)
9191
if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux'
9292
run: cd extractor && cargo build --release
9393
- name: Generate dbscheme
9494
if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}}
95-
run: extractor/target/release/codeql-ruby-extractor generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
95+
run: extractor/target/release/codeql-extractor-ruby generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
9696
- uses: actions/upload-artifact@v3
9797
if: ${{ matrix.os == 'ubuntu-latest' }}
9898
with:
@@ -107,8 +107,8 @@ jobs:
107107
with:
108108
name: extractor-${{ matrix.os }}
109109
path: |
110-
ruby/extractor/target/release/codeql-ruby-extractor
111-
ruby/extractor/target/release/codeql-ruby-extractor.exe
110+
ruby/extractor/target/release/codeql-extractor-ruby
111+
ruby/extractor/target/release/codeql-extractor-ruby.exe
112112
retention-days: 1
113113
compile-queries:
114114
runs-on: ubuntu-latest-xl
@@ -166,9 +166,9 @@ jobs:
166166
mkdir -p ruby
167167
cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/
168168
mkdir -p ruby/tools/{linux64,osx64,win64}
169-
cp linux64/codeql-ruby-extractor ruby/tools/linux64/extractor
170-
cp osx64/codeql-ruby-extractor ruby/tools/osx64/extractor
171-
cp win64/codeql-ruby-extractor.exe ruby/tools/win64/extractor.exe
169+
cp linux64/codeql-extractor-ruby ruby/tools/linux64/extractor
170+
cp osx64/codeql-extractor-ruby ruby/tools/osx64/extractor
171+
cp win64/codeql-extractor-ruby.exe ruby/tools/win64/extractor.exe
172172
chmod +x ruby/tools/{linux64,osx64}/extractor
173173
zip -rq codeql-ruby.zip ruby
174174
- uses: actions/upload-artifact@v3

‎ruby/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ FILES=codeql-extractor.yml\
2424
ql/lib/ruby.dbscheme.stats\
2525
ql/lib/ruby.dbscheme
2626

27-
BIN_FILES=target/release/codeql-ruby-extractor$(EXE)
27+
BIN_FILES=target/release/codeql-extractor-ruby$(EXE)
2828

2929
extractor-common:
3030
rm -rf build
@@ -37,14 +37,14 @@ extractor-common:
3737
tools: $(BIN_FILES)
3838
rm -rf tools/bin
3939
mkdir tools/bin
40-
cp -r target/release/codeql-ruby-extractor$(EXE) tools/bin/extractor$(EXE)
40+
cp -r target/release/codeql-extractor-ruby$(EXE) tools/bin/extractor$(EXE)
4141

4242
target/release/%$(EXE):
4343
cd extractor && cargo build --release
4444

4545
dbscheme:
4646
cd extractor && cargo build --release
47-
extractor/target/release/codeql-ruby-extractor generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
47+
extractor/target/release/codeql-extractor-ruby generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
4848
codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
4949

5050
.PHONY: extractor
@@ -62,7 +62,7 @@ extractor: $(FILES) $(BIN_FILES)
6262
cp tools/autobuild.cmd extractor-pack/tools/autobuild.cmd
6363
cp ql/lib/ruby.dbscheme.stats extractor-pack/ruby.dbscheme.stats
6464
cp ql/lib/ruby.dbscheme extractor-pack/ruby.dbscheme
65-
cp extractor/target/release/codeql-ruby-extractor$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
65+
cp extractor/target/release/codeql-extractor-ruby$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
6666

6767
test: extractor dbscheme
6868
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

‎ruby/extractor/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ruby/extractor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "codeql-ruby-extractor"
2+
name = "codeql-extractor-ruby"
33
description = "CodeQL Ruby extractor"
44
version = "0.1.0"
55
authors = ["GitHub"]

‎ruby/scripts/create-extractor-pack.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cd extractor
22
cargo build --release
33
cd ..
44

5-
extractor\target\release\codeql-ruby-extractor -- generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
5+
extractor\target\release\codeql-extractor-ruby -- generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
66

77
codeql query format -i ql\lib\codeql/ruby\ast\internal\TreeSitter.qll
88

@@ -12,4 +12,4 @@ cp codeql-extractor.yml, ql\lib\ruby.dbscheme, ql\lib\ruby.dbscheme.stats extrac
1212
cp -Recurse tools extractor-pack
1313
cp -Recurse downgrades extractor-pack
1414
mkdir extractor-pack\tools\win64 | Out-Null
15-
cp extractor\target\release\codeql-ruby-extractor.exe extractor-pack\tools\win64\extractor.exe
15+
cp extractor\target\release\codeql-extractor-ruby.exe extractor-pack\tools\win64\extractor.exe

‎ruby/scripts/create-extractor-pack.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ if [[ "$CARGO" == "cross" ]]; then
2222
BIN_DIR=extractor/target/x86_64-unknown-linux-gnu/release
2323
fi
2424

25-
"$BIN_DIR/codeql-ruby-extractor" generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
25+
"$BIN_DIR/codeql-extractor-ruby" generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
2626

2727
codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
2828

2929
rm -rf extractor-pack
3030
mkdir -p extractor-pack
3131
cp -r codeql-extractor.yml downgrades tools ql/lib/ruby.dbscheme ql/lib/ruby.dbscheme.stats extractor-pack/
3232
mkdir -p extractor-pack/tools/${platform}
33-
cp "$BIN_DIR/codeql-ruby-extractor" extractor-pack/tools/${platform}/extractor
33+
cp "$BIN_DIR/codeql-extractor-ruby" extractor-pack/tools/${platform}/extractor

0 commit comments

Comments
 (0)