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

Ruby: Fix cross-compilation

Browse Source 
Ensure that builds via cargo-cross, which are executed in a docker
container, can see the shared library.
This commit is contained in:
Harry Maclean
2023-03-17 13:16:36 +13:00
parent f2fc80b3c1
commit 856132bc2f
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/actions/create-extractor-pack/action.yml
View File

@@ -24,6 +24,6 @@ runs:
if: steps.cache-extractor.outputs.cache-hit != 'true'
shell: bash
run: |
cargo install cross --version 0.2.1
cargo install cross --version 0.2.5
scripts/create-extractor-pack.sh
working-directory: ruby

6
ruby/extractor/Cross.toml
View File

@@ -1,2 +1,8 @@
[target.x86_64-unknown-linux-gnu]
image = "centos/devtoolset-7-toolchain-centos7"
[build.env]
# Provide the path to the shared extractor
# Cross mounts this directory as a volume, so builds inside the docker container
# can see it.
volumes = ["__CODEQL-EXTRACTOR=../../shared/extractor"]

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

@@ -14,7 +14,15 @@ else
fi
(cd extractor && "$CARGO" build --release)
extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
# If building via cross, the binaries will be in extractor/target/<triple>/release
# If building via cargo, the binaries will be in extractor/target/release
BIN_DIR=extractor/target/release
if [[ "$CARGO" == "cross" ]]; then
BIN_DIR=extractor/target/x86_64-unknown-linux-gnu/release
fi
"$BIN_DIR/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
@@ -22,5 +30,5 @@ 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 extractor/target/release/extractor extractor-pack/tools/${platform}/extractor
cp extractor/target/release/autobuilder extractor-pack/tools/${platform}/autobuilder
cp "$BIN_DIR/extractor" extractor-pack/tools/${platform}/extractor
cp "$BIN_DIR/autobuilder" extractor-pack/tools/${platform}/autobuilder