From 32765e9bc1fb9508dc60c5525f199f6091934870 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Wed, 3 Nov 2021 11:52:29 +0100 Subject: [PATCH 1/3] Ruby: trigger jobs on workflow change --- .github/workflows/ruby-build.yml | 10 ++++++---- .github/workflows/ruby-dataset-measure.yml | 6 ++++-- .github/workflows/ruby-qltest.yml | 10 ++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml index 4361ce5a1cc6..5449d44d2813 100644 --- a/.github/workflows/ruby-build.yml +++ b/.github/workflows/ruby-build.yml @@ -3,16 +3,18 @@ name: "Ruby: Build" on: push: paths: - - 'ruby/**' + - "ruby/**" + - .github/workflows/ruby-build.yml branches: - main - - 'rc/*' + - "rc/*" pull_request: paths: - - 'ruby/**' + - "ruby/**" + - .github/workflows/ruby-build.yml branches: - main - - 'rc/*' + - "rc/*" workflow_dispatch: inputs: tag: diff --git a/.github/workflows/ruby-dataset-measure.yml b/.github/workflows/ruby-dataset-measure.yml index 39e5a8486d60..4ae06acc855e 100644 --- a/.github/workflows/ruby-dataset-measure.yml +++ b/.github/workflows/ruby-dataset-measure.yml @@ -4,15 +4,17 @@ on: push: branches: - main - - 'rc/*' + - "rc/*" paths: - ruby/ql/lib/ruby.dbscheme + - .github/workflows/ruby-dataset-measure.yml pull_request: branches: - main - - 'rc/*' + - "rc/*" paths: - ruby/ql/lib/ruby.dbscheme + - .github/workflows/ruby-dataset-measure.yml workflow_dispatch: jobs: diff --git a/.github/workflows/ruby-qltest.yml b/.github/workflows/ruby-qltest.yml index fad38bf689e9..8a65a16b6948 100644 --- a/.github/workflows/ruby-qltest.yml +++ b/.github/workflows/ruby-qltest.yml @@ -3,16 +3,18 @@ name: "Ruby: Run QL Tests" on: push: paths: - - 'ruby/**' + - "ruby/**" + - .github/workflows/ruby-qltest.yml branches: - main - - 'rc/*' + - "rc/*" pull_request: paths: - - 'ruby/**' + - "ruby/**" + - .github/workflows/ruby-qltest.yml branches: - main - - 'rc/*' + - "rc/*" env: CARGO_TERM_COLOR: always From 2c5d5ecdd8a39eec56d05272495b755b66f095f9 Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Wed, 3 Nov 2021 11:47:12 +0100 Subject: [PATCH 2/3] Ruby: QLTest: fix pack search path for upgrades --- .github/workflows/ruby-qltest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ruby-qltest.yml b/.github/workflows/ruby-qltest.yml index 8a65a16b6948..ff2dabbc60df 100644 --- a/.github/workflows/ruby-qltest.yml +++ b/.github/workflows/ruby-qltest.yml @@ -46,5 +46,5 @@ jobs: run: | echo >empty.trap codeql dataset import -S ql/lib/upgrades/initial/ruby.dbscheme testdb empty.trap - codeql dataset upgrade testdb --additional-packs ql/lib/upgrades + codeql dataset upgrade testdb --additional-packs ql/lib diff -q testdb/ruby.dbscheme ql/lib/ruby.dbscheme From aab8c649733c9bc61bf96a864736f68ed10b479a Mon Sep 17 00:00:00 2001 From: Arthur Baars Date: Wed, 3 Nov 2021 12:32:45 +0100 Subject: [PATCH 3/3] Ruby: fix compilation error --- ruby/node-types/src/lib.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruby/node-types/src/lib.rs b/ruby/node-types/src/lib.rs index 0f1de0156923..2fccfe087aad 100644 --- a/ruby/node-types/src/lib.rs +++ b/ruby/node-types/src/lib.rs @@ -100,8 +100,7 @@ fn convert_type(node_type: &NodeType) -> TypeName { } fn convert_types(node_types: &Vec) -> Set { - let iter = node_types.iter().map(convert_type).collect(); - std::collections::BTreeSet::from(iter) + node_types.iter().map(convert_type).collect() } pub fn convert_nodes(prefix: &str, nodes: &Vec) -> NodeTypeMap {