Skip to content

Commit 6609bd3

Browse files
committed
NO MERGE - CI ONLY (tinymce)
1 parent ecc6cb3 commit 6609bd3

File tree

4 files changed

+12648
-3
lines changed

4 files changed

+12648
-3
lines changed

.github/workflows/ci.yml

+5
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
@@ -113,6 +114,10 @@ jobs:
113114
endtoend_suite: cms
114115
endtoend_config: vendor/silverstripe/cms/behat.yml
115116
endtoend_tags: job3,job4,job5,job6
117+
- php: 8.3
118+
endtoend: true
119+
endtoend_suite: htmleditor-tinymce
120+
endtoend_config: vendor/silverstripe/htmleditor-tinymce/behat.yml
116121
- php: 8.3
117122
endtoend: true
118123
endtoend_suite: linkfield

composer.json

+52-3
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,15 @@
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"
3947
},
4048
"require-dev": {
4149
"silverstripe/frameworktest": "^2",
@@ -54,6 +62,9 @@
5462
]
5563
},
5664
"config": {
65+
"platform": {
66+
"php": "8.3"
67+
},
5768
"process-timeout": 600,
5869
"allow-plugins": {
5970
"composer/installers": true,
@@ -62,5 +73,43 @@
6273
}
6374
},
6475
"prefer-stable": true,
65-
"minimum-stability": "dev"
76+
"minimum-stability": "dev",
77+
"repositories": {
78+
"silverstripe/framework": {
79+
"type": "vcs",
80+
"url": "[email protected]:creative-commoners/silverstripe-framework.git"
81+
},
82+
"silverstripe/admin": {
83+
"type": "vcs",
84+
"url": "[email protected]:creative-commoners/silverstripe-admin.git"
85+
},
86+
"silverstripe/asset-admin": {
87+
"type": "vcs",
88+
"url": "[email protected]:creative-commoners/silverstripe-asset-admin.git"
89+
},
90+
"silverstripe/cms": {
91+
"type": "vcs",
92+
"url": "[email protected]:creative-commoners/silverstripe-cms.git"
93+
},
94+
"silverstripe/supported-modules": {
95+
"type": "vcs",
96+
"url": "[email protected]:creative-commoners/supported-modules.git"
97+
},
98+
"silverstripe/htmleditor-tinymce": {
99+
"type": "vcs",
100+
"url": "[email protected]:creative-commoners/silverstripe-htmleditor-tinymce.git"
101+
},
102+
"silverstripe/behat-extension": {
103+
"type": "vcs",
104+
"url": "[email protected]:creative-commoners/silverstripe-behat-extension.git"
105+
},
106+
"silverstripe/reports": {
107+
"type": "vcs",
108+
"url": "[email protected]:creative-commoners/silverstripe-reports.git"
109+
},
110+
"dnadesign/silverstripe-elemental": {
111+
"type": "vcs",
112+
"url": "[email protected]:creative-commoners/silverstripe-elemental.git"
113+
}
114+
}
66115
}

0 commit comments

Comments
 (0)