Skip to content

Commit 36f4ee3

Browse files
committed
change gitlab-ci in order to run tests for Drupal 9.5.x & 10.x but not for Drupal 11.x+
1 parent 8e2ce39 commit 36f4ee3

File tree

4 files changed

+28
-8
lines changed

4 files changed

+28
-8
lines changed

.github/workflows/ci.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ jobs:
1111

1212
strategy:
1313
matrix:
14-
drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3', '10.4']
14+
drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3']
1515
module: ['editor_advanced_image']
1616
experimental: [ false ]
1717
include:
18+
- drupal_version: '10.4'
19+
module: 'editor_advanced_image'
20+
experimental: true
1821
- drupal_version: '10.5'
1922
module: 'editor_advanced_image'
2023
experimental: true
@@ -40,10 +43,13 @@ jobs:
4043

4144
strategy:
4245
matrix:
43-
drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3', '10.4']
46+
drupal_version: ['9.5', '10.0', '10.1', '10.2', '10.3']
4447
module: ['editor_advanced_image']
4548
experimental: [ false ]
4649
include:
50+
- drupal_version: '10.4'
51+
module: 'editor_advanced_image'
52+
experimental: true
4753
- drupal_version: '10.5'
4854
module: 'editor_advanced_image'
4955
experimental: true

.gitlab-ci.yml

+15-4
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,23 @@ include:
2929
# Docs at https://git.drupalcode.org/project/gitlab_templates/-/blob/1.0.x/includes/include.drupalci.variables.yml
3030
################
3131
variables:
32-
# Opt in to testing current minor against max supported PHP version.
32+
# The 2.x branch of the module should run on 9.5 & 10.x but not upper.
33+
CORE_STABLE: '10.4'
34+
# The 2.x branch of the module requires PHP >=8.1, rather than core's >=7.4.
35+
CORE_PREVIOUS_PHP_MIN: '8.1'
36+
37+
# Opt-in to testing previous Minor (Drupal 10.x).
38+
OPT_IN_TEST_CURRENT: '1'
39+
# Opt-in to testing current minor against max supported PHP version.
3340
OPT_IN_TEST_MAX_PHP: '1'
34-
# Opt in to testing previous (Drupal 10.1.x).
41+
# Opt-in to testing previous (Drupal 10.3.x).
3542
OPT_IN_TEST_PREVIOUS_MINOR: '1'
36-
# The 4.x branch of the CDN module requires PHP >=8.1, rather than core's >=7.4.
37-
CORE_PREVIOUS_PHP_MIN: '8.1'
43+
# Opt-in to testing previous Major (Drupal 9.5.x).
44+
OPT_IN_TEST_PREVIOUS_MAJOR: '1'
45+
# Opt-int of testing next Minor (Drupal 10.x).
46+
OPT_IN_TEST_NEXT_MINOR: '1'
47+
# Opt-out of testing next Major (Drupal 11.x).
48+
OPT_IN_TEST_NEXT_MAJOR: '0'
3849

3950
# This module wants to strictly comply with Drupal's coding standards.
4051
phpcs:

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88
### Added
9-
- add official support of drupal 10.4
9+
- add official support of drupal 10.3
1010

1111
### Removed
1212
- remove legacy version annotation on docker-compose.yml
1313

14+
### Changed
15+
- change gitlab-ci in order to run tests for Drupal 9.5.x & 10.x but not for Drupal 11.x+
16+
1417
## [2.3.0] - 2024-04-08
1518
### Fixed
1619
- fix latests phpcs latests changes

tests/src/Kernel/CKEditor4To5Upgrade/UpgradePathTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected function setUp(): void {
135135
/**
136136
* {@inheritdoc}
137137
*/
138-
public function provider() {
138+
public static function provider() {
139139
$expected_ckeditor5_toolbar = [
140140
'items' => [
141141
'bold',

0 commit comments

Comments
 (0)