mirror of
https://github.com/php/php-src.git
synced 2025-08-15 21:48:51 +02:00
Merge branch 'PHP-8.1' into PHP-8.2
This commit is contained in:
commit
9f966183eb
2 changed files with 19 additions and 0 deletions
18
.github/workflows/push.yml
vendored
18
.github/workflows/push.yml
vendored
|
@ -18,6 +18,9 @@ on:
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- '**'
|
- '**'
|
||||||
|
env:
|
||||||
|
CC: ccache gcc
|
||||||
|
CXX: ccache g++
|
||||||
jobs:
|
jobs:
|
||||||
LINUX_X64:
|
LINUX_X64:
|
||||||
strategy:
|
strategy:
|
||||||
|
@ -39,6 +42,13 @@ jobs:
|
||||||
uses: ./.github/actions/setup-oracle
|
uses: ./.github/actions/setup-oracle
|
||||||
- name: apt
|
- name: apt
|
||||||
uses: ./.github/actions/apt-x64
|
uses: ./.github/actions/apt-x64
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
# This duplicates the "job.name" expression above because
|
||||||
|
# GitHub has no way to query the job name (github.job is the
|
||||||
|
# job id, not the job name)
|
||||||
|
key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}-${{hashFiles('main/php_version.h')}}"
|
||||||
- name: ./configure
|
- name: ./configure
|
||||||
uses: ./.github/actions/configure-x64
|
uses: ./.github/actions/configure-x64
|
||||||
with:
|
with:
|
||||||
|
@ -87,6 +97,10 @@ jobs:
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: apt
|
- name: apt
|
||||||
uses: ./.github/actions/apt-x32
|
uses: ./.github/actions/apt-x32
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
|
||||||
- name: ./configure
|
- name: ./configure
|
||||||
uses: ./.github/actions/configure-x32
|
uses: ./.github/actions/configure-x32
|
||||||
with:
|
with:
|
||||||
|
@ -113,6 +127,10 @@ jobs:
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: brew
|
- name: brew
|
||||||
uses: ./.github/actions/brew
|
uses: ./.github/actions/brew
|
||||||
|
- name: ccache
|
||||||
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
|
with:
|
||||||
|
key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
|
||||||
- name: ./configure
|
- name: ./configure
|
||||||
uses: ./.github/actions/configure-macos
|
uses: ./.github/actions/configure-macos
|
||||||
with:
|
with:
|
||||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -285,6 +285,7 @@ tmp-php.ini
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
/branch-commit-cache.json
|
/branch-commit-cache.json
|
||||||
/junit.out.xml
|
/junit.out.xml
|
||||||
|
/.ccache/
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
# Special cases to invert previous ignore patterns
|
# Special cases to invert previous ignore patterns
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue