diff --git a/.github/actions/ccache/action.yml b/.github/actions/ccache/action.yml index 4b06bc90871f..5febb36af2e4 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/matrix.php b/.github/matrix.php index 829ddfe884f5..9164dd4b3c00 100644 --- a/.github/matrix.php +++ b/.github/matrix.php @@ -52,7 +52,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re $test_alpine = in_array('CI: Alpine', $labels, true); $test_benchmarking = in_array('CI: Benchmarking', $labels, true); $test_community = in_array('CI: Community', $labels, true); - $test_coverage = in_array('CI: COVERAGE', $labels, true); + $test_coverage = in_array('CI: Coverage', $labels, true); $test_freebsd = in_array('CI: FreeBSD', $labels, true); $test_libmysqlclient = in_array('CI: libmysqlclient', $labels, true); $test_linux_ppc64 = in_array('CI: Linux PPC64', $labels, true); diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml index c206ba4220b4..534366e70904 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