GHA/codeql: tidy up config names

Before this patch there was a single C config detected, named `build:`.

Closes #18555

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e33540959543c12f00c6b9af78af8f291ce47ca6..8d23d6bac272e117b260b9318dff43b92a7f8664 100644 (file)
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -41,7 +41,7 @@ concurrency:
 permissions: {}
 
 jobs:
-  codeql:
+  gha_python:
     name: 'GHA and Python'
     runs-on: ubuntu-latest
     permissions:
@@ -61,23 +61,19 @@ jobs:
         uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3
 
   c:
-    name: 'C (${{ matrix.build.name }})'
-    runs-on: ${{ matrix.build.image }}
+    name: 'C'
+    runs-on: ${{ matrix.platform == 'Linux' && 'ubuntu-latest' || 'windows-2022' }}
     permissions:
       security-events: write  # To create/update security events
     strategy:
       fail-fast: false
       matrix:
-        build:
-          - name: 'Linux'
-            image: ubuntu-latest
-          - name: 'Windows'
-            image: windows-2022
+        platform: [Linux, Windows]
     env:
-      MATRIX_IMAGE: '${{ matrix.build.image }}'
+      MATRIX_PLATFORM: '${{ matrix.platform }}'
     steps:
       - name: 'install prereqs'
-        if: ${{ contains(matrix.build.image, 'ubuntu') }}
+        if: ${{ matrix.platform == 'Linux' }}
         timeout-minutes: 5
         run: |
           sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
@@ -99,7 +95,7 @@ jobs:
         timeout-minutes: 10
         shell: bash
         run: |
-          if [[ "${MATRIX_IMAGE}" = *'windows'* ]]; then
+          if [ "${MATRIX_PLATFORM}" = 'Windows' ]; then
             cmake -B . -DBUILD_SHARED_LIBS=OFF \
               -DCMAKE_VS_GLOBALS=TrackFileAccess=false \
               -DCURL_USE_SCHANNEL=ON -DCURL_USE_LIBPSL=OFF -DUSE_WIN32_IDN=ON