From cf8cfe70a95644391aeb622f01abc1cf9f0cc2d7 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Tue, 24 Feb 2026 10:14:29 +0100
Subject: [PATCH] Fix ccache for alpine and msan

Declare CC/CXX through the ccache action.
---
 .github/actions/ccache/action.yml | 10 ++++++++--
 .github/workflows/test-suite.yml  |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/actions/ccache/action.yml b/.github/actions/ccache/action.yml
index 4b06bc90871f..276d3f53a53a 100644
--- a/.github/actions/ccache/action.yml
+++ b/.github/actions/ccache/action.yml
@@ -2,6 +2,12 @@ name: ccache
 inputs:
   name:
     required: true
+  cc:
+    required: false
+    default: 'gcc'
+  cxx:
+    required: false
+    default: 'g++'
 runs:
   using: composite
   steps:
@@ -26,5 +32,5 @@ runs:
     - name: Export CC/CXX
       shell: bash
       run: |
-        echo "CC=ccache gcc" >> $GITHUB_ENV
-        echo "CXX=ccache g++" >> $GITHUB_ENV
+        echo "CC=ccache ${{ inputs.cc }}" >> $GITHUB_ENV
+        echo "CXX=ccache ${{ inputs.cxx }}" >> $GITHUB_ENV
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index c206ba4220b4..56b15b00b56a 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -76,14 +76,14 @@ jobs:
         uses: ./.github/actions/ccache
         with:
           name: "${{ github.job }}"
+          cc: clang-20
+          cxx: clang++-20
       - name: ./configure
         uses: ./.github/actions/configure-alpine
         with:
           configurationParameters: >-
             CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
             LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
-            CC=clang-20
-            CXX=clang++-20
             --enable-debug
             --enable-zts
           skipSlow: true # FIXME: This should likely include slow extensions
@@ -712,10 +712,10 @@ jobs:
         uses: ./.github/actions/ccache
         with:
           name: "${{ github.job }}"
+          cc: clang
+          cxx: clang++
       - name: ./configure
         run: |
-          export CC=clang
-          export CXX=clang++
           export CFLAGS="-DZEND_TRACK_ARENA_ALLOC"
           ./buildconf --force
           # msan requires all used libraries to be instrumented,