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

Skip to content

Commit d942b54

Browse files
hmachmac
committed
Ruby: Update scripts for merged extractor
1 parent c139991 commit d942b54

8 files changed

Lines changed: 22 additions & 33 deletions

File tree

‎.github/workflows/ruby-build.yml‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ jobs:
5858
id: cache-extractor
5959
with:
6060
path: |
61-
ruby/extractor/target/release/autobuilder
62-
ruby/extractor/target/release/autobuilder.exe
63-
ruby/extractor/target/release/extractor
64-
ruby/extractor/target/release/extractor.exe
61+
ruby/extractor/target/release/codeql-ruby-extractor
62+
ruby/extractor/target/release/codeql-ruby-extractor.exe
6563
ruby/extractor/ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
6664
key: ${{ runner.os }}-${{ steps.os_version.outputs.version }}-ruby-extractor-${{ hashFiles('ruby/extractor/rust-toolchain.toml', 'ruby/extractor/Cargo.lock') }}--${{ hashFiles('ruby/extractor/**/*.rs') }}
6765
- uses: actions/cache@v3
@@ -88,15 +86,13 @@ jobs:
8886
run: |
8987
cd extractor
9088
cross build --release
91-
mv target/x86_64-unknown-linux-gnu/release/extractor target/release/
92-
mv target/x86_64-unknown-linux-gnu/release/autobuilder target/release/
93-
mv target/x86_64-unknown-linux-gnu/release/generator target/release/
89+
mv target/x86_64-unknown-linux-gnu/release/codeql-ruby-extractor target/release/
9490
- name: Release build (windows and macos)
9591
if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux'
9692
run: cd extractor && cargo build --release
9793
- name: Generate dbscheme
9894
if: ${{ matrix.os == 'ubuntu-latest' && steps.cache-extractor.outputs.cache-hit != 'true'}}
99-
run: extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
95+
run: extractor/target/release/codeql-ruby-extractor generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
10096
- uses: actions/upload-artifact@v3
10197
if: ${{ matrix.os == 'ubuntu-latest' }}
10298
with:
@@ -111,10 +107,8 @@ jobs:
111107
with:
112108
name: extractor-${{ matrix.os }}
113109
path: |
114-
ruby/extractor/target/release/autobuilder
115-
ruby/extractor/target/release/autobuilder.exe
116-
ruby/extractor/target/release/extractor
117-
ruby/extractor/target/release/extractor.exe
110+
ruby/extractor/target/release/codeql-ruby-extractor
111+
ruby/extractor/target/release/codeql-ruby-extractor.exe
118112
retention-days: 1
119113
compile-queries:
120114
runs-on: ubuntu-latest-xl
@@ -172,13 +166,10 @@ jobs:
172166
mkdir -p ruby
173167
cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/
174168
mkdir -p ruby/tools/{linux64,osx64,win64}
175-
cp linux64/autobuilder ruby/tools/linux64/autobuilder
176-
cp osx64/autobuilder ruby/tools/osx64/autobuilder
177-
cp win64/autobuilder.exe ruby/tools/win64/autobuilder.exe
178-
cp linux64/extractor ruby/tools/linux64/extractor
179-
cp osx64/extractor ruby/tools/osx64/extractor
180-
cp win64/extractor.exe ruby/tools/win64/extractor.exe
181-
chmod +x ruby/tools/{linux64,osx64}/{autobuilder,extractor}
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
172+
chmod +x ruby/tools/{linux64,osx64}/extractor
182173
zip -rq codeql-ruby.zip ruby
183174
- uses: actions/upload-artifact@v3
184175
with:

‎ruby/Makefile‎

Lines changed: 4 additions & 6 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/ruby-extractor$(EXE) target/release/ruby-autobuilder$(EXE)
27+
BIN_FILES=target/release/codeql-ruby-extractor$(EXE)
2828

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

4342
target/release/%$(EXE):
4443
cd extractor && cargo build --release
4544

4645
dbscheme:
4746
cd extractor && cargo build --release
48-
extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
47+
extractor/target/release/codeql-ruby-extractor generate --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
4948
codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
5049

5150
.PHONY: extractor
@@ -63,8 +62,7 @@ extractor: $(FILES) $(BIN_FILES)
6362
cp tools/autobuild.cmd extractor-pack/tools/autobuild.cmd
6463
cp ql/lib/ruby.dbscheme.stats extractor-pack/ruby.dbscheme.stats
6564
cp ql/lib/ruby.dbscheme extractor-pack/ruby.dbscheme
66-
cp extractor/target/release/extractor$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
67-
cp extractor/target/release/autobuilder$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/autobuilder$(EXE)
65+
cp extractor/target/release/codeql-ruby-extractor$(EXE) extractor-pack/tools/$(CODEQL_PLATFORM)/extractor$(EXE)
6866

6967
test: extractor dbscheme
7068
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/scripts/create-extractor-pack.ps1‎

Lines changed: 2 additions & 3 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\generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
5+
extractor\target\release\codeql-ruby-extractor -- 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,5 +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\extractor.exe extractor-pack\tools\win64\extractor.exe
16-
cp extractor\target\release\autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
15+
cp extractor\target\release\codeql-ruby-extractor.exe extractor-pack\tools\win64\extractor.exe

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

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

25-
"$BIN_DIR/generator" --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
25+
"$BIN_DIR/codeql-ruby-extractor" 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/extractor" extractor-pack/tools/${platform}/extractor
34-
cp "$BIN_DIR/autobuilder" extractor-pack/tools/${platform}/autobuilder
33+
cp "$BIN_DIR/codeql-ruby-extractor" extractor-pack/tools/${platform}/extractor

‎ruby/tools/autobuild.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@echo off
22

3-
type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\%CODEQL_PLATFORM%\autobuilder"
3+
type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\%CODEQL_PLATFORM%\extractor" autobuild
44

55
exit /b %ERRORLEVEL%

‎ruby/tools/autobuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22

3-
exec "${CODEQL_EXTRACTOR_RUBY_ROOT}/tools/${CODEQL_PLATFORM}/autobuilder"
3+
exec "${CODEQL_EXTRACTOR_RUBY_ROOT}/tools/${CODEQL_PLATFORM}/extractor" autobuild

‎ruby/tools/index-files.cmd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo off
22

33
type NUL && "%CODEQL_EXTRACTOR_RUBY_ROOT%\tools\win64\extractor.exe" ^
4+
extract ^
45
--file-list "%1" ^
56
--source-archive-dir "%CODEQL_EXTRACTOR_RUBY_SOURCE_ARCHIVE_DIR%" ^
67
--output-dir "%CODEQL_EXTRACTOR_RUBY_TRAP_DIR%"

‎ruby/tools/index-files.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
set -eu
44

55
exec "${CODEQL_EXTRACTOR_RUBY_ROOT}/tools/${CODEQL_PLATFORM}/extractor" \
6+
extract \
67
--file-list "$1" \
78
--source-archive-dir "$CODEQL_EXTRACTOR_RUBY_SOURCE_ARCHIVE_DIR" \
89
--output-dir "$CODEQL_EXTRACTOR_RUBY_TRAP_DIR"

0 commit comments

Comments
 (0)