Skip to content

Commit

Permalink
EWPP-3974: Update test matrix and supported core version.
Browse files Browse the repository at this point in the history
  • Loading branch information
brummbar committed Feb 5, 2024
1 parent 4fda9fe commit 6c9afaa
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 26 deletions.
14 changes: 7 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ services:
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
selenium:
image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-3.141.59-oxygen
shm_size: 2g
image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-4.1.3-20220405
environment:
- DISPLAY=:99
- SE_OPTS=-debug
- SCREEN_WIDTH=1280
- SCREEN_HEIGHT=800
- NODE_MAX_INSTANCES=5
Expand Down Expand Up @@ -64,9 +62,11 @@ pipeline:

matrix:
include:
- CORE_VERSION: 9.4.0
PHP_VERSION: 8.0
- CORE_VERSION: 9.4.0
- CORE_VERSION: 10.1.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.0
- CORE_VERSION: 10.1.0
PHP_VERSION: 8.2
- CORE_VERSION: 10.2.0
PHP_VERSION: 8.1
- CORE_VERSION: 10.2.0
PHP_VERSION: 8.2
9 changes: 5 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
"prefer-stable": true,
"require": {
"php": ">=8.0",
"drupal/core": "^9.4 || ^10"
"drupal/core": "^10"
},
"require-dev": {
"composer/installers": "^1.11",
"drupal/core-composer-scaffold": "^9.4 || ^10",
"drupal/core-dev": "^9.4 || ^10",
"drupal/core-composer-scaffold": "^10",
"drupal/core-dev": "^10",
"drush/drush": "^11.1",
"openeuropa/code-review": "^2.0.0-alpha6",
"openeuropa/task-runner-drupal-project-symlink": "^1.0-beta6",
Expand Down Expand Up @@ -61,7 +61,8 @@
"cweagans/composer-patches": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"phpro/grumphp": true,
"phpstan/extension-installer": true
"phpstan/extension-installer": true,
"php-http/discovery": false
}
}
}
12 changes: 3 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,18 @@ services:
# ports:
# - 3306:3306

# If you would like to see what is going on you can run the following on your host:
# docker run --rm -p 4444:4444 -p 5900:5900 --network="host" selenium/standalone-chrome-debug:latest
# Newer version of this image might run into this issue:
# @link https://github.com/elgalu/docker-selenium/issues/20
# Visit localhost:7900 to access the browser.
selenium:
image: selenium/standalone-chrome-debug:3.141.59-oxygen
image: selenium/standalone-chrome:4.1.3-20220405
expose:
- '4444'
environment:
- DISPLAY=:99
- SE_OPTS=-debug
- SCREEN_WIDTH=1280
- SCREEN_HEIGHT=800
- VNC_NO_PASSWORD=1
ports:
- '4444:4444'
- '5900:5900'
shm_size: 2g
- '7900:7900'

#### Mac users: uncomment the "volumes" key to enable the NFS file sharing. You can find more information about Docker for Mac here: https://github.com/openeuropa/openeuropa/blob/master/docs/starting/tooling.md#using-docker-on-macos

Expand Down
2 changes: 1 addition & 1 deletion entity_version.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ name: Entity version
description: Provides a way to store and keep track of the version of entities.

type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Entity version history
description: Entity version history provides a tab where version history of the entity is visualised in a table format.
type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10

dependencies:
- entity_version:entity_version
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Entity version workflows
description: Entity version workflow allows to configure and control version numbers through workflow state transitions.
type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10

dependencies:
- entity_version:entity_version
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Entity Version Workflows Example
description: Example module to test the entity version content workflow functionalities.
type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10

dependencies:
- entity_version_workflows:entity_version_workflows
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<env name="SIMPLETEST_IGNORE_DIRECTORIES" value="vendor,node_modules,${drupal.root}"/>
<env name="SIMPLETEST_BASE_URL" value="${drupal.base_url}"/>
<env name="SIMPLETEST_DB" value="mysql://${drupal.database.user}:${drupal.database.password}@${drupal.database.host}:${drupal.database.port}/${drupal.database.name}"/>
<env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", null, "${selenium.host}:${selenium.port}/wd/hub"]'/>
env name="MINK_DRIVER_ARGS_WEBDRIVER" value='["${selenium.browser}", {"browserName":"chrome","chromeOptions":{"w3c": false, "args":["--no-sandbox", "--start-maximized", "--disable-gpu", "--window-size=1440,900", "--disable-dev-shm-usage", "--disable-setuid-sandbox", "--disable-web-security", "--DNS-prefetch-disable", "--disable-translate", "--ignore-certificate-errors", "--test-type", "--disable-extensions", "--incognito", "--disable-infobars"]}}, "${selenium.host}:${selenium.port}/wd/hub"]'/>
</php>
<testsuites>
<testsuite name="Entity Version Tests">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Entity Version Test
description: Test module to test the entity version functionalities.
type: module
core_version_requirement: ^9.4 || ^10
core_version_requirement: ^10

dependencies:
- entity_version:entity_version
Expand Down

0 comments on commit 6c9afaa

Please sign in to comment.