@@ -290,14 +290,14 @@ trigger:
290290
291291---
292292kind : pipeline
293- name : mariadb10.1 -php7.3
293+ name : mariadb10.2 -php7.3
294294
295295steps :
296296- name : submodules
297297 image : ghcr.io/nextcloud/continuous-integration-alpine-git:latest
298298 commands :
299299 - git submodule update --init
300- - name : mariadb10.1 -php7.3
300+ - name : mariadb10.2 -php7.3
301301 image : ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6
302302 commands :
303303 - bash tests/drone-run-php-tests.sh || exit 0
@@ -307,7 +307,7 @@ services:
307307- name : cache
308308 image : ghcr.io/nextcloud/continuous-integration-redis:latest
309309- name : mariadb
310- image : ghcr.io/nextcloud/continuous-integration-mariadb-10.1 :10.1
310+ image : ghcr.io/nextcloud/continuous-integration-mariadb-10.2 :10.2
311311 environment :
312312 MYSQL_ROOT_PASSWORD : owncloud
313313 MYSQL_USER : oc_autotest
@@ -321,19 +321,18 @@ trigger:
321321 - master
322322 - stable*
323323 event :
324- - pull_request
325324 - push
326325
327326---
328327kind : pipeline
329- name : mariadb10.2 -php7.3
328+ name : mariadb10.3 -php7.3
330329
331330steps :
332331- name : submodules
333332 image : ghcr.io/nextcloud/continuous-integration-alpine-git:latest
334333 commands :
335334 - git submodule update --init
336- - name : mariadb10.2 -php7.3
335+ - name : mariadb10.3 -php7.3
337336 image : ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6
338337 commands :
339338 - bash tests/drone-run-php-tests.sh || exit 0
@@ -343,7 +342,7 @@ services:
343342- name : cache
344343 image : ghcr.io/nextcloud/continuous-integration-redis:latest
345344- name : mariadb
346- image : ghcr.io/nextcloud/continuous-integration-mariadb-10.2 :10.2
345+ image : ghcr.io/nextcloud/continuous-integration-mariadb-10.3 :10.3
347346 environment :
348347 MYSQL_ROOT_PASSWORD : owncloud
349348 MYSQL_USER : oc_autotest
@@ -361,24 +360,30 @@ trigger:
361360
362361---
363362kind : pipeline
364- name : mariadb10.3-php7.3
363+ name : mariadb10.4-php7.4
364+ # name: mariadb10.4-php8.0
365365
366366steps :
367367- name : submodules
368368 image : ghcr.io/nextcloud/continuous-integration-alpine-git:latest
369369 commands :
370370 - git submodule update --init
371- - name : mariadb10.3 -php7.3
372- image : ghcr.io/nextcloud/continuous-integration-php7.3 :php7.3-6
371+ - name : mariadb10.4 -php7.4
372+ image : ghcr.io/nextcloud/continuous-integration-php7.4 :php7.4-3
373373 commands :
374374 - bash tests/drone-run-php-tests.sh || exit 0
375375 - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
376+ # - name: mariadb10.4-php8.0
377+ # image: nextcloudci/php8.0:latest
378+ # commands:
379+ # - bash tests/drone-run-php-tests.sh || exit 0
380+ # - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
376381
377382services :
378383- name : cache
379384 image : ghcr.io/nextcloud/continuous-integration-redis:latest
380385- name : mariadb
381- image : ghcr.io/nextcloud/continuous-integration-mariadb-10.3 :10.3
386+ image : ghcr.io/nextcloud/continuous-integration-mariadb-10.4 :10.4
382387 environment :
383388 MYSQL_ROOT_PASSWORD : owncloud
384389 MYSQL_USER : oc_autotest
@@ -392,39 +397,36 @@ trigger:
392397 - master
393398 - stable*
394399 event :
400+ - pull_request
395401 - push
396402
397403---
398404kind : pipeline
399- name : mariadb10.4-php7.4
400- # name: mariadb10.4-php8.0
405+ name : mariadb10.6-php8.0
401406
402407steps :
403408- name : submodules
404409 image : ghcr.io/nextcloud/continuous-integration-alpine-git:latest
405410 commands :
406411 - git submodule update --init
407- - name : mariadb10.4-php7.4
408- image : ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3
412+ - name : mariadb10.6-php8.0
413+ image : ghcr.io/nextcloud/continuous-integration-php8.0:latest
409414 commands :
410415 - bash tests/drone-run-php-tests.sh || exit 0
411416 - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
412- # - name: mariadb10.4-php8.0
413- # image: nextcloudci/php8.0:latest
414- # commands:
415- # - bash tests/drone-run-php-tests.sh || exit 0
416- # - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb
417417
418418services :
419419- name : cache
420420 image : ghcr.io/nextcloud/continuous-integration-redis:latest
421421- name : mariadb
422- image : ghcr.io/nextcloud/continuous-integration-mariadb-10.4:10.4
422+ image : ghcr.io/nextcloud/continuous-integration-mariadb-10.6:latest
423423 environment :
424424 MYSQL_ROOT_PASSWORD : owncloud
425425 MYSQL_USER : oc_autotest
426426 MYSQL_PASSWORD : owncloud
427427 MYSQL_DATABASE : oc_autotest
428+ command :
429+ - --sql-mode=ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION
428430 tmpfs :
429431 - /var/lib/mysql
430432
0 commit comments