Fix attempt for codeql-path-tests job

Author: data-douser

.github/actions/setup-codeql-environment/action.yml

@@ -2,6 +2,10 @@ name: 'Setup CodeQL Environment with Languages'
 description: 'Install and configure CodeQL CLI via GitHub CLI extension and language-specific tools with optimized caching'
 
 inputs:
+  add-to-path:
+    description: 'Whether to install the CodeQL stub to PATH and set CODEQL_HOME/CODEQL_PATH environment variables. Set to false when you need only the gh-codeql extension installed (e.g. for CODEQL_PATH tests that manage PATH themselves).'
+    required: false
+    default: 'true'
   install-language-runtimes:
     description: 'Whether to install language-specific runtimes and build tools'
     required: false
@@ -136,7 +140,13 @@ runs:
           exit 1
         fi
 
-        # Create a directory for the CodeQL stub and install it there
+        echo "✅ GitHub CLI CodeQL extension installed successfully"
+
+    # Install the CodeQL stub to PATH (skipped when add-to-path is false)
+    - name: Install CodeQL stub to PATH
+      if: inputs.add-to-path == 'true'
+      shell: bash
+      run: |
         CODEQL_STUB_DIR="$HOME/.local/bin"
         mkdir -p "$CODEQL_STUB_DIR"
 
@@ -147,7 +157,7 @@ runs:
         export PATH="$CODEQL_STUB_DIR:$PATH"
         echo "PATH=$PATH" >> "$GITHUB_ENV"
 
-        echo "✅ GitHub CLI CodeQL extension installed successfully"
+        echo "✅ CodeQL stub installed to PATH"
 
     # On Windows, gh codeql install-stub creates a bash script which is not
     # discoverable by Node.js child_process.spawn() or execFile(), since
@@ -157,7 +167,7 @@ runs:
     # This workaround can be removed once github/gh-codeql#21 is merged,
     # which adds native Windows support to install-stub.
     - name: Add CodeQL binary directory to PATH (Windows)
-      if: runner.os == 'Windows'
+      if: runner.os == 'Windows' && inputs.add-to-path == 'true'
       shell: bash
       run: |
         echo "🔧 Locating actual codeql.exe binary for Windows compatibility..."
@@ -193,6 +203,7 @@ runs:
         echo "✅ Added CodeQL binary directory to PATH for Windows"
 
     - name: Setup CodeQL environment variables
+      if: inputs.add-to-path == 'true'
       id: setup-codeql-env
       shell: bash
       run: |
@@ -243,6 +254,7 @@ runs:
 
     # Verify CodeQL installation
     - name: Verify `codeql` CLI installation
+      if: inputs.add-to-path == 'true'
       shell: bash
       run: |
         echo "=== CodeQL Installation Verification ==="

.github/workflows/client-integration-tests.yml

@@ -169,53 +169,11 @@ jobs:
       - name: CODEQL_PATH Tests - Build server bundle
         run: npm run bundle -w server
 
-      - name: CODEQL_PATH Tests - Cache gh-codeql extension (Unix)
-        if: runner.os != 'Windows'
-        uses: actions/cache@v4
-        with:
-          path: ~/.local/share/gh-codeql
-          key: codeql-path-tests-${{ runner.os }}-${{ hashFiles('.codeql-version') }}
-
-      - name: CODEQL_PATH Tests - Cache gh-codeql extension (Windows)
-        if: runner.os == 'Windows'
-        uses: actions/cache@v4
+      - name: CODEQL_PATH Tests - Setup CodeQL environment
+        uses: ./.github/actions/setup-codeql-environment
         with:
-          path: ~\AppData\Local\GitHub\gh-codeql
-          key: codeql-path-tests-${{ runner.os }}-${{ hashFiles('.codeql-version') }}
-
-      - name: CODEQL_PATH Tests - Install CodeQL CLI via gh codeql
-        id: install-codeql
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          CODEQL_VERSION=$(tr -d '[:space:]' < .codeql-version | sed 's/^v//')
-          echo "Installing CodeQL CLI version: $CODEQL_VERSION"
-
-          # Check if the gh-codeql extension is already installed
-          if ! gh extension list | grep -q "github/gh-codeql"; then
-            echo "Installing gh-codeql extension..."
-            gh extension install github/gh-codeql
-          else
-            echo "gh-codeql extension is already installed"
-          fi
-
-          # Verify the extension is available before using it
-          if ! gh codeql version &>/dev/null; then
-            echo "::error::gh codeql extension is not working properly"
-            exit 1
-          fi
-
-          gh codeql set-version "$CODEQL_VERSION"
-
-          INSTALLED=$(gh codeql version --format=terse)
-          if [[ "$INSTALLED" != "$CODEQL_VERSION" ]]; then
-            echo "::error::Version mismatch: installed=$INSTALLED expected=$CODEQL_VERSION"
-            exit 1
-          fi
-
-          echo "✅ CodeQL CLI $INSTALLED installed via gh-codeql"
-          echo "codeql-version=$CODEQL_VERSION" >> "$GITHUB_OUTPUT"
+          add-to-path: false
+          install-language-runtimes: false
 
       ## Locate the real CodeQL binary (not the gh-codeql bash stub).
       ## The stub delegates to `gh codeql` and works from bash, but Node.js
@@ -250,13 +208,14 @@ jobs:
 
           # Verify the binary works and reports the expected version
           ACTUAL=$("$CODEQL_BINARY" version --format=terse 2>/dev/null)
-          EXPECTED="${{ steps.install-codeql.outputs.codeql-version }}"
+          EXPECTED=$(codeql version --format=terse 2>/dev/null)
           if [[ "$ACTUAL" != "$EXPECTED" ]]; then
             echo "::error::Binary version mismatch: got '$ACTUAL', expected '$EXPECTED'"
             exit 1
           fi
 
           echo "✅ CodeQL binary verified: $CODEQL_BINARY (version $ACTUAL)"
+          echo "codeql-version=$ACTUAL" >> "$GITHUB_OUTPUT"
           echo "codeql-binary=$CODEQL_BINARY" >> "$GITHUB_OUTPUT"
 
       ## Build a PATH that excludes every directory containing 'codeql'.
@@ -316,6 +275,6 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "| Detail | Value |" >> $GITHUB_STEP_SUMMARY
           echo "| ------ | ----- |" >> $GITHUB_STEP_SUMMARY
-          echo "| CodeQL Version | ${{ steps.install-codeql.outputs.codeql-version }} |" >> $GITHUB_STEP_SUMMARY
+          echo "| CodeQL Version | ${{ steps.locate-codeql.outputs.codeql-version }} |" >> $GITHUB_STEP_SUMMARY
           echo "| CodeQL Binary | \`${{ steps.locate-codeql.outputs.codeql-binary }}\` |" >> $GITHUB_STEP_SUMMARY
           echo "| OS | ${{ matrix.os }} |" >> $GITHUB_STEP_SUMMARY