QL: Fix the autobuilder (temporary bad fix)

Author: erik-krogh

ql/autobuilder/src/main.rs

@@ -15,25 +15,29 @@ fn main() -> std::io::Result<()> {
     let mut cmd = Command::new(codeql);
     cmd.arg("database")
         .arg("index-files")
-        .arg("--include-extension=.ql")
-        .arg("--include-extension=.qll")
-        .arg("--include-extension=.dbscheme")
-        .arg("--include=**/qlpack.yml")
         .arg("--size-limit=5m")
         .arg("--language=ql")
         .arg("--working-dir=.")
         .arg(db);
 
+    let mut has_include_dir = false; // TODO: This is a horrible hack, wait for the post-merge discussion in https://github.com/github/codeql/pull/7444 to be resolved
     for line in env::var("LGTM_INDEX_FILTERS")
         .unwrap_or_default()
         .split('\n')
     {
         if let Some(stripped) = line.strip_prefix("include:") {
             cmd.arg("--include").arg(stripped);
+            has_include_dir = true;
         } else if let Some(stripped) = line.strip_prefix("exclude:") {
             cmd.arg("--exclude").arg(stripped);
         }
     }
+    if !has_include_dir {
+        cmd.arg("--include-extension=.ql")
+            .arg("--include-extension=.qll")
+            .arg("--include-extension=.dbscheme")
+            .arg("--include=**/qlpack.yml");
+    }
     let exit = &cmd.spawn()?.wait()?;
     std::process::exit(exit.code().unwrap_or(1))
 }

ql/extractor/src/main.rs

@@ -127,6 +127,15 @@ fn main() -> std::io::Result<()> {
     lines
         .par_iter()
         .try_for_each(|line| {
+            // only consider files that end with .ql/.qll/.dbscheme/qlpack.yml
+            // TODO: This is a bad fix, wait for the post-merge discussion in https://github.com/github/codeql/pull/7444 to be resolved
+            if !line.ends_with(".ql")
+                && !line.ends_with(".qll")
+                && !line.ends_with(".dbscheme")
+                && !line.ends_with("qlpack.yml")
+            {
+                return Ok(());
+            }
             let path = PathBuf::from(line).canonicalize()?;
             let src_archive_file = path_for(&src_archive_dir, &path, "");
             let source = std::fs::read(&path)?;