From ab4eba11ec6c572d3ae0d27d6768c14247ed2ffe Mon Sep 17 00:00:00 2001 From: Harry Maclean Date: Wed, 19 Apr 2023 06:27:27 +0000 Subject: [PATCH] Ruby: Rename extractor to codeql-extractor-ruby --- .github/workflows/ruby-build.yml | 18 +++++++++--------- ruby/Makefile | 8 ++++---- ruby/extractor/Cargo.lock | Bin 31065 -> 31065 bytes ruby/extractor/Cargo.toml | 2 +- ruby/scripts/create-extractor-pack.ps1 | 4 ++-- ruby/scripts/create-extractor-pack.sh | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml index 2a1cc740cc0..51d1fea9697 100644 --- a/.github/workflows/ruby-build.yml +++ b/.github/workflows/ruby-build.yml @@ -58,8 +58,8 @@ jobs: id: cache-extractor with: path: | - ruby/extractor/target/release/codeql-ruby-extractor - ruby/extractor/target/release/codeql-ruby-extractor.exe + ruby/extractor/target/release/codeql-extractor-ruby + ruby/extractor/target/release/codeql-extractor-ruby.exe 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') }} - uses: actions/cache@v3 @@ -86,13 +86,13 @@ jobs: run: | cd extractor 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) if: steps.cache-extractor.outputs.cache-hit != 'true' && runner.os != 'Linux' run: cd extractor && cargo build --release - name: Generate dbscheme 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 if: ${{ matrix.os == 'ubuntu-latest' }} with: @@ -107,8 +107,8 @@ jobs: with: name: extractor-${{ matrix.os }} path: | - ruby/extractor/target/release/codeql-ruby-extractor - ruby/extractor/target/release/codeql-ruby-extractor.exe + ruby/extractor/target/release/codeql-extractor-ruby + ruby/extractor/target/release/codeql-extractor-ruby.exe retention-days: 1 compile-queries: runs-on: ubuntu-latest-xl @@ -166,9 +166,9 @@ jobs: mkdir -p ruby cp -r codeql-extractor.yml tools ql/lib/ruby.dbscheme.stats ruby/ mkdir -p ruby/tools/{linux64,osx64,win64} - cp linux64/codeql-ruby-extractor ruby/tools/linux64/extractor - cp osx64/codeql-ruby-extractor ruby/tools/osx64/extractor - cp win64/codeql-ruby-extractor.exe ruby/tools/win64/extractor.exe + cp linux64/codeql-extractor-ruby ruby/tools/linux64/extractor + cp osx64/codeql-extractor-ruby ruby/tools/osx64/extractor + cp win64/codeql-extractor-ruby.exe ruby/tools/win64/extractor.exe chmod +x ruby/tools/{linux64,osx64}/extractor zip -rq codeql-ruby.zip ruby - uses: actions/upload-artifact@v3 diff --git a/ruby/Makefile b/ruby/Makefile index 2f52e0a860b..5759d4fd64b 100644 --- a/ruby/Makefile +++ b/ruby/Makefile @@ -24,7 +24,7 @@ FILES=codeql-extractor.yml\ ql/lib/ruby.dbscheme.stats\ ql/lib/ruby.dbscheme -BIN_FILES=target/release/codeql-ruby-extractor$(EXE) +BIN_FILES=target/release/codeql-extractor-ruby$(EXE) extractor-common: rm -rf build @@ -37,14 +37,14 @@ extractor-common: tools: $(BIN_FILES) rm -rf 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): cd extractor && cargo build --release dbscheme: 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 .PHONY: extractor @@ -62,7 +62,7 @@ extractor: $(FILES) $(BIN_FILES) 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 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 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 diff --git a/ruby/extractor/Cargo.lock b/ruby/extractor/Cargo.lock index 405490755776fbfc0df87c8620ff6fc0995eac4c..85c546b9b96e189aae02de3062127274df104d7b 100644 GIT binary patch delta 24 gcmccliSgzq#tn-ECZFZ!WYsMyO{(0yL11MD0F!_U>i_@% delta 23 fcmccliSgzq#tn-ESc*!MDkq=eH`;tdpfLjgj5-SC diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml index 9b0817744be..133233f2f14 100644 --- a/ruby/extractor/Cargo.toml +++ b/ruby/extractor/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "codeql-ruby-extractor" +name = "codeql-extractor-ruby" description = "CodeQL Ruby extractor" version = "0.1.0" authors = ["GitHub"] diff --git a/ruby/scripts/create-extractor-pack.ps1 b/ruby/scripts/create-extractor-pack.ps1 index b51fc98a1df..72c7d01180c 100644 --- a/ruby/scripts/create-extractor-pack.ps1 +++ b/ruby/scripts/create-extractor-pack.ps1 @@ -2,7 +2,7 @@ cd extractor cargo build --release 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 @@ -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 downgrades extractor-pack 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 diff --git a/ruby/scripts/create-extractor-pack.sh b/ruby/scripts/create-extractor-pack.sh index c1b71efa6b2..15efba5350e 100755 --- a/ruby/scripts/create-extractor-pack.sh +++ b/ruby/scripts/create-extractor-pack.sh @@ -22,7 +22,7 @@ if [[ "$CARGO" == "cross" ]]; then BIN_DIR=extractor/target/x86_64-unknown-linux-gnu/release 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 @@ -30,4 +30,4 @@ rm -rf extractor-pack mkdir -p 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} -cp "$BIN_DIR/codeql-ruby-extractor" extractor-pack/tools/${platform}/extractor +cp "$BIN_DIR/codeql-extractor-ruby" extractor-pack/tools/${platform}/extractor