-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[stable10] drone mariadb 10.3 #35785
Closed
Closed
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
7240267
Set min PHP version to 7.1
5a29832
PHP 7.1+ is required
DeepDiver1975 008a43a
Adjust drone for PHP7.1 like master
phil-davis fa51b62
Remove our own sqlite autoincrement hack
DeepDiver1975 b070863
[Workaround] .... until https://github.com/sebastianbergmann/phpunit-…
DeepDiver1975 cf1d79f
Disable phpstan in drone until we can sort out code fix backporting
phil-davis 9caf76f
Do not test postgres:10.3 - needs more backports
phil-davis 887f8c7
Fix ExceptionPlugin.php logException like in master
phil-davis bc1ed9f
Add mariadb 10.3 to Drone
a3a6e49
Detect MariaDB > 10.3.1 and assume mb4 support
99cd4fd
Remove obsolete MariaDB 10.2 workaround
9090768
Add MySQL 8 which defaults to mb4 mode
1e7e559
Unit tests for mysql mb4 detection
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -115,15 +115,6 @@ pipeline: | |
matrix: | ||
TEST_SUITE: owncloud-coding-standard | ||
|
||
php-phan-70: | ||
image: owncloudci/php:7.0 | ||
pull: true | ||
commands: | ||
- make test-php-phan | ||
when: | ||
matrix: | ||
TEST_SUITE: phan-70 | ||
|
||
php-phan-71: | ||
image: owncloudci/php:7.1 | ||
pull: true | ||
|
@@ -214,6 +205,15 @@ pipeline: | |
matrix: | ||
PRIMARY_OBJECTSTORE: files_primary_s3 | ||
|
||
phpstan: | ||
image: owncloudci/php:${PHP_VERSION} | ||
pull: true | ||
commands: | ||
- make test-php-phpstan | ||
when: | ||
matrix: | ||
TEST_SUITE: phpstan | ||
|
||
phpunit: | ||
image: owncloudci/php:${PHP_VERSION} | ||
pull: true | ||
|
@@ -479,7 +479,7 @@ pipeline: | |
services: | ||
|
||
mariadb: | ||
image: mariadb:10.2 | ||
image: ${MARIADB_IMAGE=mariadb:10.2} | ||
environment: | ||
- MYSQL_USER=owncloud | ||
- MYSQL_PASSWORD=owncloud | ||
|
@@ -490,7 +490,7 @@ services: | |
DB_TYPE: mariadb | ||
|
||
mysql: | ||
image: mysql:5.5 | ||
image: ${MYSQL_IMAGE=mysql:5.5} | ||
environment: | ||
- MYSQL_USER=owncloud | ||
- MYSQL_PASSWORD=owncloud | ||
|
@@ -500,19 +500,21 @@ services: | |
matrix: | ||
DB_TYPE: mysql | ||
|
||
mysqlmb4: | ||
image: mysql:5.7 | ||
mysql8: | ||
image: ${MYSQL_IMAGE=mysql:8.0} | ||
# see http://php.net/manual/en/mysqli.requirements.php | ||
command: --default-authentication-plugin=mysql_native_password | ||
environment: | ||
- MYSQL_USER=owncloud | ||
- MYSQL_PASSWORD=owncloud | ||
- MYSQL_DATABASE=owncloud | ||
- MYSQL_ROOT_PASSWORD=owncloud | ||
when: | ||
matrix: | ||
DB_TYPE: mysqlmb4 | ||
DB_TYPE: mysql8 | ||
|
||
postgres: | ||
image: postgres:9.4 | ||
image: ${POSTGRES_IMAGE=postgres:9.4} | ||
environment: | ||
- POSTGRES_USER=owncloud | ||
- POSTGRES_PASSWORD=owncloud | ||
|
@@ -663,14 +665,16 @@ matrix: | |
- PHP_VERSION: 7.3 | ||
TEST_SUITE: owncloud-coding-standard | ||
|
||
# phan (runs on just PHP 7.0 because that has different dependencies for phan) | ||
- TEST_SUITE: phan-70 | ||
PHP_VERSION: 7.0 | ||
|
||
# phan (runs multiple PHP v7.1+ to provide syntax checks of each PHP version) | ||
# phan (runs multiple PHP v7.* to provide syntax checks of each PHP version) | ||
- TEST_SUITE: phan | ||
PHP_VERSION: 7.1 | ||
|
||
# phpstan | ||
# disable in stable10 until code fixes can be backported | ||
# - TEST_SUITE: phpstan | ||
# PHP_VERSION: 7.1 | ||
# INSTALL_SERVER: true | ||
|
||
# Litmus | ||
- PHP_VERSION: 7.1 | ||
USE_SERVER: true | ||
|
@@ -688,65 +692,94 @@ matrix: | |
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.1 | ||
DB_TYPE: mysqlmb4 | ||
DB_TYPE: mysql | ||
# mb4 support, with innodb_file_format=Barracuda | ||
MYSQL_IMAGE: mysql:5.7 | ||
TEST_SUITE: phpunit | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.1 | ||
# mb4 support by default | ||
DB_TYPE: mysql8 | ||
TEST_SUITE: phpunit | ||
COVERAGE: false | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
# - PHP_VERSION: 7.1 | ||
# DB_TYPE: mariadb | ||
# TEST_SUITE: phpunit | ||
# INSTALL_SERVER: true | ||
|
||
- PHP_VERSION: 7.1 | ||
DB_TYPE: postgres | ||
POSTGRES_IMAGE: postgres:9.4 | ||
TEST_SUITE: phpunit | ||
COVERAGE: true | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
# - PHP_VERSION: 7.1 | ||
# DB_TYPE: postgres | ||
# POSTGRES_IMAGE: postgres:10.3 | ||
# TEST_SUITE: phpunit | ||
# COVERAGE: true | ||
# INSTALL_SERVER: true | ||
# INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.1 | ||
DB_TYPE: oracle | ||
DB_TYPE: mariadb | ||
# mb4 support by default | ||
MARIADB_IMAGE: mariadb:10.3 | ||
TEST_SUITE: phpunit | ||
COVERAGE: true | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.1 | ||
DB_TYPE: sqlite | ||
DB_TYPE: mariadb | ||
# mb4 support by default | ||
MARIADB_IMAGE: mariadb:10.3 | ||
TEST_SUITE: phpunit | ||
COVERAGE: true | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this line should not have been deleted. |
||
|
||
# PHP 7.0 | ||
- PHP_VERSION: 7.0 | ||
DB_TYPE: mysql | ||
- PHP_VERSION: 7.1 | ||
DB_TYPE: oracle | ||
TEST_SUITE: phpunit | ||
COVERAGE: true | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.0 | ||
DB_TYPE: mysqlmb4 | ||
- PHP_VERSION: 7.1 | ||
DB_TYPE: sqlite | ||
TEST_SUITE: phpunit | ||
COVERAGE: true | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.0 | ||
DB_TYPE: postgres | ||
# PHP 7.2 | ||
- PHP_VERSION: 7.2 | ||
DB_TYPE: sqlite | ||
TEST_SUITE: phpunit | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.0 | ||
DB_TYPE: oracle | ||
- PHP_VERSION: 7.2 | ||
DB_TYPE: mariadb | ||
TEST_SUITE: phpunit | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
# PHP 7.2 | ||
- PHP_VERSION: 7.2 | ||
# PHP 7.3 | ||
- PHP_VERSION: 7.3 | ||
DB_TYPE: sqlite | ||
TEST_SUITE: phpunit | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.2 | ||
- PHP_VERSION: 7.3 | ||
DB_TYPE: mariadb | ||
TEST_SUITE: phpunit | ||
INSTALL_SERVER: true | ||
|
@@ -799,15 +832,6 @@ matrix: | |
INSTALL_TESTING_APP: true | ||
|
||
# Primary Objectstorage | ||
- PHP_VERSION: 7.0 | ||
TEST_SUITE: phpunit | ||
DB_TYPE: sqlite | ||
OBJECTSTORE: swift | ||
PRIMARY_OBJECTSTORE: swift | ||
FILES_EXTERNAL_TYPE: swift | ||
INSTALL_SERVER: true | ||
INSTALL_TESTING_APP: true | ||
|
||
- PHP_VERSION: 7.1 | ||
TEST_SUITE: phpunit | ||
COVERAGE: true | ||
|
@@ -1632,20 +1656,6 @@ matrix: | |
OWNCLOUD_LOG: true | ||
CALDAV_CARDDAV_JOB: true | ||
|
||
# This suite is part of the encryption app in later core versions | ||
- PHP_VERSION: 7.0 | ||
TEST_SUITE: cli | ||
BEHAT_SUITE: cliEncryption | ||
DB_TYPE: mariadb | ||
USE_SERVER: true | ||
SERVER_PROTOCOL: https | ||
INSTALL_SERVER: true | ||
CHOWN_SERVER: true | ||
OWNCLOUD_LOG: true | ||
CONFIGURE_ENCRYPTION: true | ||
ENCRYPTION_TYPE: masterkey | ||
INSTALL_TESTING_APP: true | ||
|
||
# This suite is part of the encryption app in later core versions | ||
- PHP_VERSION: 7.1 | ||
TEST_SUITE: cli | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
note: this is already in an earlier commit from "future drop php 7.0" - so at the moment we get these mariadb:10.3 unit tests run twice. No harm in that!