Skip to content

Commit 49ce909

Browse files
committed
NO MERGE - CI ONLY (tinymce)
1 parent ecc6cb3 commit 49ce909

File tree

4 files changed

+12725
-4
lines changed

4 files changed

+12725
-4
lines changed

.github/workflows/ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
name: CI
1111
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
1212
with:
13+
composer_install: true
1314
# Use simple_matrix to limit the number of created jobs
1415
# phpunit.xml.dist has a large number of testsuites, all of which are tested with
1516
# multiple versions of php + databases in both the modules themselves and other recipes
@@ -98,6 +99,10 @@ jobs:
9899
endtoend: true
99100
endtoend_suite: blog
100101
endtoend_config: vendor/silverstripe/blog/behat.yml
102+
- php: 8.3
103+
endtoend: true
104+
endtoend_suite: campaign-admin
105+
endtoend_config: vendor/silverstripe/campaign-admin/behat.yml
101106
- php: 8.3
102107
endtoend: true
103108
endtoend_suite: cms
@@ -113,6 +118,10 @@ jobs:
113118
endtoend_suite: cms
114119
endtoend_config: vendor/silverstripe/cms/behat.yml
115120
endtoend_tags: job3,job4,job5,job6
121+
- php: 8.3
122+
endtoend: true
123+
endtoend_suite: htmleditor-tinymce
124+
endtoend_config: vendor/silverstripe/htmleditor-tinymce/behat.yml
116125
- php: 8.3
117126
endtoend: true
118127
endtoend_suite: linkfield

composer.json

+54-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"silverstripe/taxonomy": "4.0.x-dev",
2424
"silverstripe/textextraction": "5.0.x-dev",
2525
"silverstripe/userforms": "7.0.x-dev",
26-
"dnadesign/silverstripe-elemental": "6.0.x-dev",
26+
"dnadesign/silverstripe-elemental": "dev-pulls/6.0/tinymce as 6.0.x-dev",
2727
"dnadesign/silverstripe-elemental-userforms": "5.0.x-dev",
2828
"symbiote/silverstripe-advancedworkflow": "7.0.x-dev",
2929
"symbiote/silverstripe-gridfieldextensions": "5.0.x-dev",
@@ -35,7 +35,16 @@
3535
"silverstripe/graphql": "6.0.x-dev",
3636
"silverstripe/subsites": "4.0.x-dev",
3737
"silverstripe/blog": "5.0.x-dev",
38-
"silverstripe/crontask": "4.0.x-dev"
38+
"silverstripe/crontask": "4.0.x-dev",
39+
"silverstripe/framework": "dev-pulls/6.0/tinymce as 6.0.9999999.9999999-dev",
40+
"silverstripe/admin": "dev-pulls/3.0/tinymce as 3.0.9999999.9999999-dev",
41+
"silverstripe/asset-admin": "dev-pulls/3.0/tinymce as 3.0.9999999.9999999-dev",
42+
"silverstripe/cms": "dev-pulls/6.0/tinymce as 6.0.9999999.9999999-dev",
43+
"silverstripe/supported-modules": "dev-pulls/main/support-tinymce as 1.99.999",
44+
"silverstripe/htmleditor-tinymce": "dev-pulls/1.0/migrate-here",
45+
"silverstripe/behat-extension": "dev-pulls/6/no-tinymce as 6.9999999.9999999.9999999-dev",
46+
"silverstripe/reports": "dev-pulls/6.0/no-tinymce as 6.0.9999999.9999999-dev",
47+
"silverstripe/campaign-admin": "3.0.x-dev"
3948
},
4049
"require-dev": {
4150
"silverstripe/frameworktest": "^2",
@@ -54,6 +63,9 @@
5463
]
5564
},
5665
"config": {
66+
"platform": {
67+
"php": "8.3"
68+
},
5769
"process-timeout": 600,
5870
"allow-plugins": {
5971
"composer/installers": true,
@@ -62,5 +74,43 @@
6274
}
6375
},
6476
"prefer-stable": true,
65-
"minimum-stability": "dev"
66-
}
77+
"minimum-stability": "dev",
78+
"repositories": {
79+
"silverstripe/framework": {
80+
"type": "vcs",
81+
"url": "[email protected]:creative-commoners/silverstripe-framework.git"
82+
},
83+
"silverstripe/admin": {
84+
"type": "vcs",
85+
"url": "[email protected]:creative-commoners/silverstripe-admin.git"
86+
},
87+
"silverstripe/asset-admin": {
88+
"type": "vcs",
89+
"url": "[email protected]:creative-commoners/silverstripe-asset-admin.git"
90+
},
91+
"silverstripe/cms": {
92+
"type": "vcs",
93+
"url": "[email protected]:creative-commoners/silverstripe-cms.git"
94+
},
95+
"silverstripe/supported-modules": {
96+
"type": "vcs",
97+
"url": "[email protected]:creative-commoners/supported-modules.git"
98+
},
99+
"silverstripe/htmleditor-tinymce": {
100+
"type": "vcs",
101+
"url": "[email protected]:creative-commoners/silverstripe-htmleditor-tinymce.git"
102+
},
103+
"silverstripe/behat-extension": {
104+
"type": "vcs",
105+
"url": "[email protected]:creative-commoners/silverstripe-behat-extension.git"
106+
},
107+
"silverstripe/reports": {
108+
"type": "vcs",
109+
"url": "[email protected]:creative-commoners/silverstripe-reports.git"
110+
},
111+
"dnadesign/silverstripe-elemental": {
112+
"type": "vcs",
113+
"url": "[email protected]:creative-commoners/silverstripe-elemental.git"
114+
}
115+
}
116+
}

0 commit comments

Comments
 (0)