Skip to content

Commit 68d4ee3

Browse files
committed
Fix ccache for alpine and msan
Declare CC/CXX through the ccache action. Closes phpGH-21286
1 parent ee40ca3 commit 68d4ee3

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

.github/actions/ccache/action.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ inputs:
55
php_directory:
66
required: false
77
default: '.'
8+
cc:
9+
required: false
10+
default: 'gcc'
11+
cxx:
12+
required: false
13+
default: 'g++'
814
runs:
915
using: composite
1016
steps:
@@ -29,5 +35,5 @@ runs:
2935
- name: Export CC/CXX
3036
shell: bash
3137
run: |
32-
echo "CC=ccache gcc" >> $GITHUB_ENV
33-
echo "CXX=ccache g++" >> $GITHUB_ENV
38+
echo "CC=ccache ${{ inputs.cc }}" >> $GITHUB_ENV
39+
echo "CXX=ccache ${{ inputs.cxx }}" >> $GITHUB_ENV

.github/workflows/test-suite.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ jobs:
7676
uses: ./.github/actions/ccache
7777
with:
7878
name: "${{ github.job }}"
79+
cc: clang-20
80+
cxx: clang++-20
7981
- name: ./configure
8082
uses: ./.github/actions/configure-alpine
8183
with:
8284
configurationParameters: >-
8385
CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
8486
LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
85-
CC=clang-20
86-
CXX=clang++-20
8787
--enable-debug
8888
--enable-zts
8989
skipSlow: true # FIXME: This should likely include slow extensions
@@ -708,10 +708,10 @@ jobs:
708708
uses: ./.github/actions/ccache
709709
with:
710710
name: "${{ github.job }}"
711+
cc: clang
712+
cxx: clang++
711713
- name: ./configure
712714
run: |
713-
export CC=clang
714-
export CXX=clang++
715715
export CFLAGS="-DZEND_TRACK_ARENA_ALLOC"
716716
./buildconf --force
717717
# msan requires all used libraries to be instrumented,

0 commit comments

Comments
 (0)