Skip to content

Commit 9f96618

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
2 parents cb907d5 + f7e6784 commit 9f96618

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

.github/workflows/push.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ on:
1818
pull_request:
1919
branches:
2020
- '**'
21+
env:
22+
CC: ccache gcc
23+
CXX: ccache g++
2124
jobs:
2225
LINUX_X64:
2326
strategy:
@@ -39,6 +42,13 @@ jobs:
3942
uses: ./.github/actions/setup-oracle
4043
- name: apt
4144
uses: ./.github/actions/apt-x64
45+
- name: ccache
46+
uses: hendrikmuhs/[email protected]
47+
with:
48+
# This duplicates the "job.name" expression above because
49+
# GitHub has no way to query the job name (github.job is the
50+
# job id, not the job name)
51+
key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}-${{hashFiles('main/php_version.h')}}"
4252
- name: ./configure
4353
uses: ./.github/actions/configure-x64
4454
with:
@@ -87,6 +97,10 @@ jobs:
8797
uses: actions/checkout@v3
8898
- name: apt
8999
uses: ./.github/actions/apt-x32
100+
- name: ccache
101+
uses: hendrikmuhs/[email protected]
102+
with:
103+
key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
90104
- name: ./configure
91105
uses: ./.github/actions/configure-x32
92106
with:
@@ -113,6 +127,10 @@ jobs:
113127
uses: actions/checkout@v3
114128
- name: brew
115129
uses: ./.github/actions/brew
130+
- name: ccache
131+
uses: hendrikmuhs/[email protected]
132+
with:
133+
key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
116134
- name: ./configure
117135
uses: ./.github/actions/configure-macos
118136
with:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ tmp-php.ini
285285
# ------------------------------------------------------------------------------
286286
/branch-commit-cache.json
287287
/junit.out.xml
288+
/.ccache/
288289

289290
# ------------------------------------------------------------------------------
290291
# Special cases to invert previous ignore patterns

0 commit comments

Comments
 (0)