Fix falling compiler version selection

Author: Bronek

.github/workflows/debian.yml

@@ -12,6 +12,8 @@ env:
   BUILDKIT_PROGRESS: plain
   CONAN_VERSION: 2.17.0
   NONROOT_USER: ci
+  FALLBACK_GCC: 12
+  FALLBACK_CLANG: 16
 
 jobs:
   # Build the Docker image for Debian using different versions of GCC and Clang.
@@ -92,12 +94,12 @@ jobs:
           build-args: |
             BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
             BUILDKIT_INLINE_CACHE=1
-            CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || '' }}
+            CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || env.FALLBACK_CLANG }}
+            GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || env.FALLBACK_GCC }}
             CONAN_VERSION=${{ env.CONAN_VERSION }}
-            DEBIAN_VERSION=${{ matrix.os.release }}
-            GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || '' }}
             GITHUB_REPO=${{ github.repository }}
             NONROOT_USER=${{ env.NONROOT_USER }}
+            DEBIAN_VERSION=${{ matrix.os.release }}
           context: docker/debian
           outputs: type=image,name=${{ env.CONTAINER_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           platforms: ${{ matrix.architecture.platform }}

.github/workflows/rhel.yml

@@ -32,9 +32,6 @@ jobs:
           - release: 9.6
             compiler_name: gcc
             compiler_version: 14
-          - release: 9.6
-            compiler_name: clang
-            compiler_version: ''
     runs-on: ${{ matrix.architecture.runner }}
     permissions:
       packages: write
@@ -86,7 +83,7 @@ jobs:
             BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
             BUILDKIT_INLINE_CACHE=1
             CONAN_VERSION=${{ env.CONAN_VERSION }}
-            GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || '' }}
+            GCC_VERSION=${{ matrix.os.compiler_version }}
             GITHUB_REPO=${{ github.repository }}
             NONROOT_USER=${{ env.NONROOT_USER }}
             RHEL_VERSION=${{ matrix.os.release }}

.github/workflows/ubuntu.yml

@@ -12,6 +12,8 @@ env:
   BUILDKIT_PROGRESS: plain
   CONAN_VERSION: 2.17.0
   NONROOT_USER: ci
+  FALLBACK_GCC: 12
+  FALLBACK_CLANG: 16
 
 jobs:
   # Build the Docker image for Ubuntu using different versions of GCC and Clang.
@@ -90,9 +92,9 @@ jobs:
           build-args: |
             BUILDKIT_DOCKERFILE_CHECK=skip=InvalidDefaultArgInFrom
             BUILDKIT_INLINE_CACHE=1
-            CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || '' }}
+            CLANG_VERSION=${{ matrix.os.compiler_name == 'clang' && matrix.os.compiler_version || env.FALLBACK_CLANG }}
+            GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || env.FALLBACK_GCC }}
             CONAN_VERSION=${{ env.CONAN_VERSION }}
-            GCC_VERSION=${{ matrix.os.compiler_name == 'gcc' && matrix.os.compiler_version || '' }}
             GITHUB_REPO=${{ github.repository }}
             NONROOT_USER=${{ env.NONROOT_USER }}
             UBUNTU_VERSION=${{ matrix.os.release }}