Skip to content

Commit 5bbc5b3

Browse files
committed
Copy missing parts from old push.yml file
1 parent f03e21b commit 5bbc5b3

File tree

2 files changed

+32
-8
lines changed

2 files changed

+32
-8
lines changed

.github/workflows/nightly.yml

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,17 @@ jobs:
145145
echo "::group::Show installed package versions"
146146
dpkg -l
147147
echo "::endgroup::"
148+
- name: Setup Caddy server
149+
uses: ./.github/actions/setup-caddy
150+
- name: ccache
151+
uses: hendrikmuhs/ccache-action@v1.2
152+
with:
153+
# This duplicates the "job.name" expression above because
154+
# GitHub has no way to query the job name (github.job is the
155+
# job id, not the job name)
156+
key: "LINUX_X64_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}${{ matrix.asan && '_ASAN' || '' }}-${{hashFiles('main/php_version.h')}}"
157+
append-timestamp: false
158+
save: ${{ github.event_name != 'pull_request' }}
148159
- name: ./configure
149160
uses: ./.github/actions/configure-x64
150161
with:
@@ -153,14 +164,16 @@ jobs:
153164
${{ matrix.variation && 'CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"' || '' }}
154165
${{ (matrix.variation && fromJson(inputs.branch).jobs.LINUX_X64.config.variation_enable_zend_max_execution_timers) && '--enable-zend-max-execution-timers' || '' }}
155166
--${{ matrix.debug && 'enable' || 'disable' }}-debug
167+
${{ matrix.debug && 'CXXFLAGS="-D_GLIBCXX_ASSERTIONS"' || '' }}
156168
--${{ matrix.zts && 'enable' || 'disable' }}-zts
157169
asan: ${{ matrix.asan && 'true' || 'false' }}
158-
skipSlow: ${{ (matrix.asan && !matrix.comprehensive) && 'true' || 'false' }}
170+
skipSlow: ${{ (matrix.asan && !inputs.comprehensive) && 'true' || 'false' }}
159171
- name: make
160172
run: make -j$(/usr/bin/nproc) >/dev/null
161173
- name: make install
162174
uses: ./.github/actions/install-linux
163175
- name: Setup
176+
if: ${{ !matrix.asan && !inputs.comprehensive }}
164177
uses: ./.github/actions/setup-x64
165178
- name: Test
166179
if: ${{ inputs.comprehensive || !matrix.asan }}
@@ -177,6 +190,7 @@ jobs:
177190
jitType: tracing
178191
runTestsParameters: >-
179192
${{ matrix.asan && '--asan' || '' }}
193+
${{ (matrix.asan && !inputs.comprehensive) && '-x' || '' }}
180194
${{ matrix.repeat && '--repeat 2' || '' }}
181195
${{ matrix.variation && '-d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0' || '' }}
182196
-d opcache.enable_cli=1
@@ -214,6 +228,9 @@ jobs:
214228
container:
215229
image: ubuntu:${{ fromJson(inputs.branch).config.ubuntu_version }}
216230
env:
231+
MYSQL_TEST_HOST: mysql
232+
PDO_MYSQL_TEST_DSN: mysql:host=mysql;dbname=test
233+
PDO_MYSQL_TEST_HOST: mysql
217234
PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb
218235
services:
219236
mysql:
@@ -239,6 +256,12 @@ jobs:
239256
ref: ${{ fromJson(inputs.branch).ref }}
240257
- name: apt
241258
uses: ./.github/actions/apt-x32
259+
- name: ccache
260+
uses: hendrikmuhs/ccache-action@v1.2
261+
with:
262+
key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
263+
append-timestamp: false
264+
save: ${{ github.event_name != 'pull_request' }}
242265
- name: System info
243266
run: |
244267
echo "::group::Show host CPU info"
@@ -260,30 +283,24 @@ jobs:
260283
- name: Test
261284
if: ${{ inputs.comprehensive }}
262285
uses: ./.github/actions/test-linux
263-
with:
264-
runTestsParameters: >-
265-
${{ matrix.run_tests_parameters }}
266286
- name: Test Tracing JIT
267287
uses: ./.github/actions/test-linux
268288
with:
269289
jitType: tracing
270290
runTestsParameters: >-
271-
${{ matrix.run_tests_parameters }}
272291
-d opcache.enable_cli=1
273292
- name: Test OpCache
274293
if: ${{ inputs.comprehensive }}
275294
uses: ./.github/actions/test-linux
276295
with:
277296
runTestsParameters: >-
278-
${{ matrix.run_tests_parameters }}
279297
-d opcache.enable_cli=1
280298
- name: Test Function JIT
281299
if: ${{ inputs.comprehensive }}
282300
uses: ./.github/actions/test-linux
283301
with:
284302
jitType: function
285303
runTestsParameters: >-
286-
${{ matrix.run_tests_parameters }}
287304
-d opcache.enable_cli=1
288305
- name: Extra tests
289306
uses: ./.github/actions/extra-tests
@@ -304,6 +321,12 @@ jobs:
304321
- name: brew
305322
timeout-minutes: 10
306323
uses: ./.github/actions/brew
324+
- name: ccache
325+
uses: hendrikmuhs/ccache-action@v1.2
326+
with:
327+
key: "${{github.job}}-${{matrix.os}}-${{hashFiles('main/php_version.h')}}"
328+
append-timestamp: false
329+
save: ${{ github.event_name != 'pull_request' }}
307330
- name: ./configure
308331
uses: ./.github/actions/configure-macos
309332
with:
@@ -327,7 +350,7 @@ jobs:
327350
runTestsParameters: >-
328351
-d opcache.enable_cli=1
329352
- name: Test OpCache
330-
if: ${{ inputs.comprehensive }}
353+
if: ${{ inputs.comprehensive || (matrix.arch == 'ARM64' && matrix.zts) }}
331354
uses: ./.github/actions/test-macos
332355
with:
333356
runTestsParameters: >-

.github/workflows/push.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ env:
3333
jobs:
3434
GENERATE_MATRIX:
3535
name: Generate Matrix
36+
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
3637
runs-on: ubuntu-latest
3738
outputs:
3839
branches: ${{ steps.set-matrix.outputs.branches }}

0 commit comments

Comments
 (0)