From c8cd3aeb1ed2d6f860d1637786277dbb8840a21b Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Tue, 24 Feb 2026 10:07:44 +0100 Subject: [PATCH] Fix ccache for coverage and pecl builds Coverage cannot use ccache as it is incompatible with gcov. Pecl clones PHP to the ./php directory, rather than the cwd. Closes GH-21285 --- .github/actions/ccache/action.yml | 9 ++++++--- .github/workflows/test-suite.yml | 5 +---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/ccache/action.yml b/.github/actions/ccache/action.yml index 4b06bc90871..5febb36af2e 100644 --- a/.github/actions/ccache/action.yml +++ b/.github/actions/ccache/action.yml @@ -2,6 +2,9 @@ name: ccache inputs: name: required: true + php_directory: + required: false + default: '.' runs: using: composite steps: @@ -9,9 +12,9 @@ runs: shell: bash id: cache_key run: | - major=$(cat main/php_version.h | sed -En 's/^#define PHP_MAJOR_VERSION ([0-9]+)/\1/p') - minor=$(cat main/php_version.h | sed -En 's/^#define PHP_MINOR_VERSION ([0-9]+)/\1/p') - release=$(cat main/php_version.h | sed -En 's/^#define PHP_RELEASE_VERSION ([0-9]+)/\1/p') + major=$(cat ${{ inputs.php_directory }}/main/php_version.h | sed -En 's/^#define PHP_MAJOR_VERSION ([0-9]+)/\1/p') + minor=$(cat ${{ inputs.php_directory }}/main/php_version.h | sed -En 's/^#define PHP_MINOR_VERSION ([0-9]+)/\1/p') + release=$(cat ${{ inputs.php_directory }}/main/php_version.h | sed -En 's/^#define PHP_RELEASE_VERSION ([0-9]+)/\1/p') week=$(date +"%Y-%W") prefix="${{ inputs.name }}-$major.$minor.$release" echo "key=$prefix-$week" >> $GITHUB_OUTPUT diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index c206ba4220b..534366e7090 100644 --- a/.github/workflows/test-suite.yml +++ b/.github/workflows/test-suite.yml @@ -396,10 +396,6 @@ jobs: uses: ./.github/actions/apt-x64 - name: Install gcovr run: sudo -H pip install gcovr - - name: ccache - uses: ./.github/actions/ccache - with: - name: "${{ github.job }}" - name: ./configure uses: ./.github/actions/configure-x64 with: @@ -880,6 +876,7 @@ jobs: uses: ./.github/actions/ccache with: name: "${{ github.job }}" + php_directory: php - name: build PHP run: | cd php