Fixes for actions workflow failures 9

Author: data-douser

.github/workflows/internal-validate-cli-outputs.yml

@@ -16,8 +16,12 @@ env:
 
 jobs:
   validate-cli-outputs:
-    name: Validate CodeQlToolkit `query generate new-query` subcommand
+    name: "Generate, validate, and test `new-query` CLI - (${{ matrix.language }})"
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [cpp, csharp, go, java, javascript, python, ruby]
 
     steps:
       - name: Checkout repository
@@ -59,14 +63,16 @@ jobs:
           codeql-cli-version: 'latest'
           codeql-stdlib-version: 'latest'
 
-      - name: Run end-to-end CLI validation
-        run: ./scripts/validate-cli-e2e.sh
+      - name: "Run end-to-end CLI validation for '${{ matrix.language }}' language"
+        run: ./scripts/validate-cli-e2e.sh --languages ${{ matrix.language }}
 
-      - name: Upload test artifacts on failure
+      - name: "Upload test artifacts on failure for '${{ matrix.language }}' language"
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: cli-validation-artifacts
-          path: ${{ runner.temp }}/qlt-cli-e2e-test/**
+          name: cli-validation-artifacts-${{ matrix.language }}
+          path: |
+            ${{ runner.temp }}/qlt-cli-e2e-test/${{ matrix.language }}/**
+            !${{ runner.temp }}/qlt-cli-e2e-test/${{ matrix.language }}/**/*.testproj
           if-no-files-found: warn
-          retention-days: 3
+          retention-days: 2

src/CodeQLToolkit.Features/CodeQLToolkit.Features.csproj

@@ -30,6 +30,9 @@
     <None Update="Templates\Query\codeql-workspace.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Templates\Query\all\testref.liquid">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Update="Templates\Query\cpp\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -48,9 +51,6 @@
     <None Update="Templates\Query\cpp\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\cpp\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Query\csharp\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -69,9 +69,6 @@
     <None Update="Templates\Query\csharp\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\csharp\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Query\go\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -90,9 +87,6 @@
     <None Update="Templates\Query\go\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\go\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Query\java\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -111,9 +105,6 @@
     <None Update="Templates\Query\java\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\java\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Query\javascript\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -132,9 +123,6 @@
     <None Update="Templates\Query\javascript\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\javascript\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Query\python\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -153,9 +141,6 @@
     <None Update="Templates\Query\python\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\python\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Query\ruby\expected.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -174,9 +159,6 @@
     <None Update="Templates\Query\ruby\test.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Templates\Query\ruby\testref.liquid">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Templates\Test\Actions\install-codeql.liquid">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/CodeQLToolkit.Features/Templates/Query/all/testref.liquid

@@ -0,0 +1 @@
+{{ query_name }}/{{ query_name }}.ql

src/CodeQLToolkit.Features/Templates/Query/cpp/testref.liquid

@@ -5,12 +5,4 @@ subpaths
 #select
 {%- else -%}
 | {{ test_file_prefix }}.cs:0:0:0:0 | {{ test_file_prefix }}.cs | Replace this with your query. |
-| {{ test_file_prefix }}.dll:0:0:0:0 | {{ test_file_prefix }}.dll | Replace this with your query. |
-| file:///Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Console.dll:0:0:0:0 | /Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Console.dll | Replace this with your query. |
-| file:///Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Core.dll:0:0:0:0 | /Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Core.dll | Replace this with your query. |
-| file:///Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Private.CoreLib.dll:0:0:0:0 | /Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Private.CoreLib.dll | Replace this with your query. |
-| file:///Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Runtime.dll:0:0:0:0 | /Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.Runtime.dll | Replace this with your query. |
-| file:///Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.dll:0:0:0:0 | /Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/System.dll | Replace this with your query. |
-| file:///Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/mscorlib.dll:0:0:0:0 | /Users/data-douser/.qlt/packages/d5b581ceb3581aa73dec1e8b043e68bf/codeql/csharp/tools/osx64/mscorlib.dll | Replace this with your query. |
-| file://:0:0:0:0 |  | Replace this with your query. |
 {%- endif -%}

src/CodeQLToolkit.Features/Templates/Query/csharp/expected.liquid

@@ -1,14 +1,15 @@
 /**
- * @id {{language}}/{{query_pack_name}}/{{query_name | downcase}}
- * @name {{query_name}}
- * @description {{description}}
+ * @id {{ language }}/{{ query_pack_name }}/{{ query_name | downcase }}
+ * @name {{ query_name }}
+ * @description {{ description }}
  * @kind problem
  * @precision medium
  * @problem.severity error
- * @tags {{query_pack_name}}
+ * @tags {{ query_pack_name }}
  */
 
 import {{ql_language_import}}
 
 from File f
+where f.getBaseName() = "{{ query_name }}.cs"
 select f, "Replace this with your query."