Skip to content

Commit 9820098

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Move Opcache variation job to GitHub actions
2 parents e10961b + 1bef2e5 commit 9820098

File tree

3 files changed

+71
-93
lines changed

3 files changed

+71
-93
lines changed

.github/workflows/nightly.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,3 +289,74 @@ jobs:
289289
git rev-parse HEAD
290290
sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
291291
php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
292+
OPCACHE_VARIATION:
293+
needs: GENERATE_MATRIX
294+
if: ${{ needs.GENERATE_MATRIX.outputs.branches != '[]' }}
295+
strategy:
296+
fail-fast: false
297+
matrix:
298+
branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }}
299+
name: "${{ matrix.branch.name }}_OPCACHE_VARIATION"
300+
runs-on: ubuntu-20.04
301+
steps:
302+
- name: git checkout
303+
uses: actions/checkout@v2
304+
with:
305+
ref: ${{ matrix.branch.ref }}
306+
- name: Create MSSQL container
307+
uses: ./.github/actions/setup-mssql
308+
- name: Create Oracle container
309+
uses: ./.github/actions/setup-oracle
310+
- name: apt
311+
uses: ./.github/actions/apt-x64
312+
- name: ./configure
313+
uses: ./.github/actions/configure-x64
314+
with:
315+
configurationParameters: >-
316+
--enable-debug --disable-zts
317+
- name: make
318+
run: make -j$(/usr/bin/nproc) >/dev/null
319+
- name: make install
320+
uses: ./.github/actions/install-linux
321+
- name: Setup
322+
uses: ./.github/actions/setup-x64
323+
- name: Test File Cache (prime shm)
324+
uses: ./.github/actions/test-linux
325+
with:
326+
runTestsParameters: >-
327+
-d zend_extension=opcache.so
328+
-d opcache.enable_cli=1
329+
--file-cache-prime
330+
- name: Test File Cache (prime shm, use shm)
331+
uses: ./.github/actions/test-linux
332+
with:
333+
runTestsParameters: >-
334+
-d zend_extension=opcache.so
335+
-d opcache.enable_cli=1
336+
--file-cache-use
337+
- name: Test File Cache (prime shm, use file)
338+
uses: ./.github/actions/test-linux
339+
with:
340+
runTestsParameters: >-
341+
-d zend_extension=opcache.so
342+
-d opcache.enable_cli=1
343+
--file-cache-use
344+
-d opcache.file_cache_only=1
345+
- name: Test File Cache Only (prime)
346+
uses: ./.github/actions/test-linux
347+
with:
348+
runTestsParameters: >-
349+
-d zend_extension=opcache.so
350+
-d opcache.enable_cli=1
351+
--file-cache-prime
352+
-d opcache.file_cache_only=1
353+
- name: Test File Cache Only (use)
354+
uses: ./.github/actions/test-linux
355+
with:
356+
runTestsParameters: >-
357+
-d zend_extension=opcache.so
358+
-d opcache.enable_cli=1
359+
--file-cache-use
360+
-d opcache.file_cache_only=1
361+
- name: Verify generated files are up to date
362+
uses: ./.github/actions/verify-generated-files

azure-pipelines.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ jobs:
5050
configurationParameters: '--enable-debug --enable-zts'
5151
runTestsParameters: --msan
5252
timeoutInMinutes: 90
53-
- template: azure/opcache_variation_job.yml
54-
parameters:
55-
configurationName: DEBUG_NTS_OPCACHE
56-
configurationParameters: '--enable-debug --disable-zts'
57-
timeoutInMinutes: 120
5853
- template: azure/job.yml
5954
parameters:
6055
configurationName: DEBUG_NTS_REPEAT

azure/opcache_variation_job.yml

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)