Skip to content

Commit a3955c5

Browse files
committed
NO MERGE - CI ONLY (without tinymce)
1 parent ecc6cb3 commit a3955c5

File tree

3 files changed

+12576
-3
lines changed

3 files changed

+12576
-3
lines changed

.github/workflows/ci.yml

+1
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

composer.json

+47-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,14 @@
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/behat-extension": "dev-pulls/6/no-tinymce as 6.9999999.9999999.9999999-dev",
45+
"silverstripe/reports": "dev-pulls/6.0/no-tinymce as 6.0.9999999.9999999-dev"
3946
},
4047
"require-dev": {
4148
"silverstripe/frameworktest": "^2",
@@ -54,6 +61,9 @@
5461
]
5562
},
5663
"config": {
64+
"platform": {
65+
"php": "8.3"
66+
},
5767
"process-timeout": 600,
5868
"allow-plugins": {
5969
"composer/installers": true,
@@ -62,5 +72,39 @@
6272
}
6373
},
6474
"prefer-stable": true,
65-
"minimum-stability": "dev"
75+
"minimum-stability": "dev",
76+
"repositories": {
77+
"silverstripe/framework": {
78+
"type": "vcs",
79+
"url": "[email protected]:creative-commoners/silverstripe-framework.git"
80+
},
81+
"silverstripe/admin": {
82+
"type": "vcs",
83+
"url": "[email protected]:creative-commoners/silverstripe-admin.git"
84+
},
85+
"silverstripe/asset-admin": {
86+
"type": "vcs",
87+
"url": "[email protected]:creative-commoners/silverstripe-asset-admin.git"
88+
},
89+
"silverstripe/cms": {
90+
"type": "vcs",
91+
"url": "[email protected]:creative-commoners/silverstripe-cms.git"
92+
},
93+
"silverstripe/supported-modules": {
94+
"type": "vcs",
95+
"url": "[email protected]:creative-commoners/supported-modules.git"
96+
},
97+
"silverstripe/behat-extension": {
98+
"type": "vcs",
99+
"url": "[email protected]:creative-commoners/silverstripe-behat-extension.git"
100+
},
101+
"silverstripe/reports": {
102+
"type": "vcs",
103+
"url": "[email protected]:creative-commoners/silverstripe-reports.git"
104+
},
105+
"dnadesign/silverstripe-elemental": {
106+
"type": "vcs",
107+
"url": "[email protected]:creative-commoners/silverstripe-elemental.git"
108+
}
109+
}
66110
}

0 commit comments

Comments
 (0)