Merge pull request #17 from advanced-security/jsinglet/bundle-feature-tmp

Integration PR to test Workflows

Author: jsinglet

.github/workflows/run-codeql-unit-tests-cpp.yml

@@ -5,9 +5,11 @@ on:
   push:
     branches:
       - 'main'
+      - 'jsinglet/**'
   pull_request:
     branches:
       - 'main'
+      - 'jsinglet/**'
   workflow_dispatch:
 
 
@@ -63,6 +65,9 @@ jobs:
         run: |
           echo "Installing CodeQL"
           qlt codeql run install --base example/
+          echo "-----------------------------"
+          echo "CodeQL Home: $QLT_CODEQL_HOME"
+          echo "CodeQL Binary: $QLT_CODEQL_PATH"
 
       - name: Verify Versions of Tooling
         shell: bash

src/CodeQLToolkit.Features/CodeQL/Commands/CodeQLCommandFeature.cs

@@ -54,6 +54,7 @@ public void Register(Command parentCommand)
                 new InstallCommand()
                 {
                     Base = basePath,
+                    AutomationTarget = automationType,
                 }.Run();
 
 

src/CodeQLToolkit.Features/CodeQL/Commands/Targets/InstallCommand.cs

@@ -1,4 +1,5 @@
 using CodeQLToolkit.Shared.CodeQL;
+using CodeQLToolkit.Shared.Types;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -29,10 +30,20 @@ public override void Run()
                 Log<InstallCommand>.G().LogInformation($"Installing CodeQL...");
                 installation.Install();
 
+
                 // set the environment variable
+                Log<InstallCommand>.G().LogInformation($"Setting QLT_CODEQL_HOME to {installation.CodeQLHome}...");
+                Log<InstallCommand>.G().LogInformation($"Setting QLT_CODEQL_PATH to {installation.CodeQLToolBinary}...");
+
                 Environment.SetEnvironmentVariable("QLT_CODEQL_HOME", installation.CodeQLHome);
                 Environment.SetEnvironmentVariable("QLT_CODEQL_PATH", installation.CodeQLToolBinary);
 
+                if (AutomationTypeHelper.AutomationTypeFromString(AutomationTarget) == AutomationType.ACTIONS)
+                {
+                    File.AppendAllText(Environment.GetEnvironmentVariable("GITHUB_ENV"), $"QLT_CODEQL_HOME={installation.CodeQLHome}" + "\n");
+                    File.AppendAllText(Environment.GetEnvironmentVariable("GITHUB_ENV"), $"QLT_CODEQL_PATH={installation.CodeQLToolBinary}" + "\n");
+                }
+
             }
 
 

src/CodeQLToolkit.Features/Query/Commands/Targets/InstallQueryPacksCommandTarget.cs

@@ -1,4 +1,5 @@
-using System;
+using CodeQLToolkit.Shared.CodeQL;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -18,13 +19,17 @@ public override void Run()
 
             Log<InstallQueryPacksCommandTarget>.G().LogInformation($"Got {files.Length} packs...");
 
+
+            var installation = CodeQLInstallation.LoadFromConfig(Base);
+
+
             foreach ( string file in files )
             {
                 Log<InstallQueryPacksCommandTarget>.G().LogInformation($"Installing qlpack {file}...");
 
                 using(Process  process = new Process())
                 {
-                    process.StartInfo.FileName = "codeql";
+                    process.StartInfo.FileName = installation.CodeQLToolBinary;
                     process.StartInfo.UseShellExecute = false;
                     process.StartInfo.RedirectStandardOutput = false;
                     process.StartInfo.Arguments = $"pack install {file}";

src/CodeQLToolkit.Shared/Target/CommandTarget.cs

@@ -9,5 +9,6 @@ namespace CodeQLToolkit.Shared.Target
     public abstract class CommandTarget : ITarget
     {
         public string Language { get; set; }
+        public string AutomationTarget { get; set; }
     }
 }