Skip to content

Commit 140336b

Browse files
iluuu1994iluuu1994
committed
wip
1 parent 91f94a9 commit 140336b

File tree

2 files changed

+47
-58
lines changed

2 files changed

+47
-58
lines changed

‎.github/nightly_matrix.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ function get_branch_matrix($branches) {
7373
$branch_key = strtoupper(str_replace('.', '', $branch));
7474
return [
7575
'name' => $branch_key,
76-
'branch' => $branch,
76+
'ref' => $branch,
7777
];
7878
}, $branches);
7979

80-
return ['branches' => $result];
80+
return ['branch' => $result];
8181
}
8282

8383
$branches = get_branches();

‎.github/workflows/nightly.yml

Lines changed: 45 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@ jobs:
6565
# extended: ${{ inputs.extendedTests }}
6666
# runTestsParameters: ${{ inputs.runTestsParameters }}
6767
debug_zts_msan:
68-
needs: generate_matrix
69-
strategy:
70-
matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
71-
fail-fast: false
72-
name: ${{ matrix.name }}
68+
# needs: generate_matrix
69+
# strategy:
70+
# matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
71+
# fail-fast: false
72+
# name: ${{ matrix.branch.name }}
7373
runs-on: ubuntu-20.04
7474
env:
75-
arch: linux-x64
75+
ARCH: linux-x64
7676
steps:
7777
- name: git checkout
7878
uses: actions/checkout@v2
7979
# Only test on current branch until merged
8080
# with:
81-
# ref: ${{ matrix.branch }}
81+
# ref: ${{ matrix.branch.ref }}
8282
- name: Install dependencies
8383
uses: ./.github/actions/deps
8484
- name: ./configure
@@ -91,7 +91,7 @@ jobs:
9191
# so we should avoiding linking against anything but libc here
9292
./configure \
9393
--enable-debug \
94-
--enable-zts
94+
--enable-zts \
9595
--enable-option-checking=fatal \
9696
--prefix=/usr \
9797
--without-sqlite3 \
@@ -143,20 +143,20 @@ jobs:
143143
extended: false
144144
runTestsParameters: '--msan'
145145
community:
146-
needs: generate_matrix
147-
strategy:
148-
matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
149-
fail-fast: false
150-
name: ${{ matrix.name }}
146+
# needs: generate_matrix
147+
# strategy:
148+
# matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
149+
# fail-fast: false
150+
# name: ${{ matrix.branch.name }}
151151
runs-on: ubuntu-20.04
152152
env:
153-
arch: linux-x64
153+
ARCH: linux-x64
154154
steps:
155155
- name: git checkout
156156
uses: actions/checkout@v2
157157
# Only test on current branch until merged
158158
# with:
159-
# ref: ${{ matrix.branch }}
159+
# ref: ${{ matrix.branch.ref }}
160160
- name: Install dependencies
161161
uses: ./.github/actions/deps
162162
- name: ./configure
@@ -179,11 +179,6 @@ jobs:
179179
run: |
180180
sudo service mysql start
181181
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
182-
- name: Test
183-
uses: ./.github/actions/tests
184-
with:
185-
extended: false
186-
runTestsParameters: '--msan'
187182
- name: Test Laravel
188183
run: |
189184
git clone https://github.com/laravel/framework.git --branch=master --depth=1
@@ -253,20 +248,20 @@ jobs:
253248
sed -i 's/PHP_SAPI/"cli-server"/g' var/cache/dev/App_KernelDevDebugContainer.preload.php
254249
php -d opcache.preload=var/cache/dev/App_KernelDevDebugContainer.preload.php public/index.php
255250
coverage:
256-
needs: generate_matrix
257-
strategy:
258-
matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
259-
fail-fast: false
260-
name: ${{ matrix.name }}
251+
# needs: generate_matrix
252+
# strategy:
253+
# matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
254+
# fail-fast: false
255+
# name: ${{ matrix.branch.name }}
261256
runs-on: ubuntu-20.04
262257
env:
263-
arch: linux-x64
258+
ARCH: linux-x64
264259
steps:
265260
- name: git checkout
266261
uses: actions/checkout@v2
267262
# Only test on current branch until merged
268263
# with:
269-
# ref: ${{ matrix.branch }}
264+
# ref: ${{ matrix.branch.ref }}
270265
- name: Create mssql container
271266
uses: ./.github/actions/mssql
272267
- name: Install dependencies
@@ -303,20 +298,20 @@ jobs:
303298
# codeCoverageTool: 'Cobertura'
304299
# summaryFileLocation: coverage.xml
305300
opcache_variation:
306-
needs: generate_matrix
307-
strategy:
308-
matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
309-
fail-fast: false
310-
name: ${{ matrix.name }}
301+
# needs: generate_matrix
302+
# strategy:
303+
# matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
304+
# fail-fast: false
305+
# name: ${{ matrix.branch.name }}
311306
runs-on: ubuntu-20.04
312307
env:
313-
arch: linux-x64
308+
ARCH: linux-x64
314309
steps:
315310
- name: git checkout
316311
uses: actions/checkout@v2
317312
# Only test on current branch until merged
318313
# with:
319-
# ref: ${{ matrix.branch }}
314+
# ref: ${{ matrix.branch.ref }}
320315
- name: Create mssql container
321316
uses: ./.github/actions/mssql
322317
- name: Install dependencies
@@ -331,57 +326,53 @@ jobs:
331326
uses: ./.github/actions/install
332327
- name: Setup
333328
uses: ./.github/actions/setup
334-
- name: Test
329+
- name: Test File Cache (prime shm)
335330
uses: ./.github/actions/test
336331
with:
337332
runTestsParameters: -d zend_extension=opcache.so --file-cache-prime
338-
- name: Test
333+
- name: Test File Cache (prime shm, use shm)
339334
uses: ./.github/actions/test
340335
with:
341336
runTestsParameters: -d zend_extension=opcache.so --file-cache-use
342-
- name: Test
343-
uses: ./.github/actions/test
344-
with:
345-
runTestsParameters: -d zend_extension=opcache.so --file-cache-use
346-
- name: Test
337+
- name: Test File Cache (prime shm, use file)
347338
uses: ./.github/actions/test
348339
with:
349340
runTestsParameters: -d zend_extension=opcache.so --file-cache-use -d opcache.file_cache_only=1
350-
- name: Test
341+
- name: Test File Cache (prime file)
351342
uses: ./.github/actions/test
352343
with:
353344
runTestsParameters: -d zend_extension=opcache.so --file-cache-prime -d opcache.file_cache_only=1
354-
- name: Test
345+
- name: Test File Cache (prime file, use file)
355346
uses: ./.github/actions/test
356347
with:
357348
runTestsParameters: -d zend_extension=opcache.so --file-cache-use -d opcache.file_cache_only=1
358-
- name: Test
349+
- name: Test File Cache (prime file, use shm)
359350
uses: ./.github/actions/test
360351
with:
361352
runTestsParameters: -d zend_extension=opcache.so --file-cache-use
362-
- name: Test
353+
- name: Test Without interned strings
363354
uses: ./.github/actions/test
364355
with:
365356
runTestsParameters: -d zend_extension=opcache.so -d opcache.interned_strings_buffer=0
366-
- name: Test
357+
- name: Test Preload
367358
uses: ./.github/actions/test
368359
with:
369360
runTestsParameters: -d zend_extension=opcache.so --preload
370361
libmysqlclient_debug_nts:
371-
needs: generate_matrix
372-
strategy:
373-
matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
374-
fail-fast: false
375-
name: ${{ matrix.name }}
362+
# needs: generate_matrix
363+
# strategy:
364+
# matrix: ${{ fromJson(needs.generate_matrix.outputs.branch_matrix) }}
365+
# fail-fast: false
366+
# name: ${{ matrix.branch.name }}
376367
runs-on: ubuntu-20.04
377368
env:
378-
arch: linux-x64
369+
ARCH: linux-x64
379370
steps:
380371
- name: git checkout
381372
uses: actions/checkout@v2
382373
# Only test on current branch until merged
383374
# with:
384-
# ref: ${{ matrix.branch }}
375+
# ref: ${{ matrix.branch.ref }}
385376
- name: Install dependencies
386377
run: |
387378
sudo apt-get update -y | true
@@ -398,13 +389,11 @@ jobs:
398389
# with:
399390
# configurationName: LIBMYSQLCLIENT_DEBUG_NTS - MySQL 5.6.49
400391
# libmysql: mysql-5.6.49-linux-glibc2.12-x86_64.tar.gz
401-
- uses: ./.github/actions/libmysql-test
402-
with:
403-
runTestsParameters: -d zend_extension=opcache.so --preload
404392
- uses: ./.github/actions/libmysql-test
405393
with:
406394
configurationName: LIBMYSQLCLIENT_DEBUG_NTS - MySQL 5.7.35
407395
libmysql: mysql-5.7.35-linux-glibc2.12-x86_64.tar.gz
396+
configurationParameters: --enable-debug --disable-zts
408397
- uses: ./.github/actions/libmysql-test
409398
with:
410399
configurationName: LIBMYSQLCLIENT_DEBUG_NTS - MySQL 8.0.27

0 commit comments

Comments
 (0)