Skip to content

Commit d0aa281

Browse files
committed
.
1 parent ecc6cb3 commit d0aa281

File tree

4 files changed

+12666
-9
lines changed

4 files changed

+12666
-9
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
@@ -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

composer.json

+58-9
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"php": "^8.3",
99
"silverstripe/recipe-plugin": "2.0.x-dev",
1010
"silverstripe/installer": "6.0.x-dev",
11-
"silverstripe/developer-docs": "6.0.x-dev",
11+
"silverstripe/developer-docs": "dev-pulls/6.0/campaign-admin as 6.0.x-dev",
1212
"silverstripe/hybridsessions": "4.0.x-dev",
1313
"silverstripe/totp-authenticator": "6.0.x-dev",
1414
"silverstripe/mfa": "6.0.x-dev",
@@ -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/campaign-admin 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,14 +35,18 @@
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"
39-
},
40-
"require-dev": {
41-
"silverstripe/frameworktest": "^2",
38+
"silverstripe/crontask": "4.0.x-dev",
39+
"silverstripe/frameworktest": "2.x-dev",
4240
"silverstripe/graphql-devtools": "2.x-dev",
4341
"silverstripe/recipe-testing": "^4",
4442
"silverstripe/webauthn-authenticator": "6.x-dev",
45-
"mikey179/vfsstream": "^1.6"
43+
"mikey179/vfsstream": "^1.6.10",
44+
"silverstripe/campaign-admin": "dev-pulls/3.0/campaign-admin as 3.0.x-dev",
45+
"silverstripe/admin": "dev-pulls/3.0/campaign-admin as 3.0.x-dev",
46+
"silverstripe/cms": "dev-pulls/6.0/campaign-admin as 6.0.x-dev",
47+
"silverstripe/asset-admin": "dev-pulls/3.0/campaign-admin as 3.0.x-dev",
48+
"silverstripe/assets": "dev-pulls/3.0/campaign-admin as 3.0.x-dev",
49+
"silverstripe/versioned": "dev-pulls/3.0/campaign-admin as 3.0.x-dev"
4650
},
4751
"extra": {
4852
"project-files": [
@@ -58,9 +62,54 @@
5862
"allow-plugins": {
5963
"composer/installers": true,
6064
"silverstripe/recipe-plugin": true,
61-
"silverstripe/vendor-plugin": true
65+
"silverstripe/vendor-plugin": true,
66+
"dealerdirect/phpcodesniffer-composer-installer": true
67+
},
68+
"platform": {
69+
"php": "8.3"
6270
}
6371
},
6472
"prefer-stable": true,
65-
"minimum-stability": "dev"
73+
"minimum-stability": "dev",
74+
"repositories": {
75+
"x0": {
76+
"type": "vcs",
77+
"url": "[email protected]:creative-commoners/silverstripe-campaign-admin"
78+
},
79+
"x1": {
80+
"type": "vcs",
81+
"url": "[email protected]:creative-commoners/silverstripe-admin"
82+
},
83+
"x2": {
84+
"type": "vcs",
85+
"url": "[email protected]:creative-commoners/silverstripe-cms"
86+
},
87+
"x3": {
88+
"type": "vcs",
89+
"url": "[email protected]:creative-commoners/silverstripe-asset-admin"
90+
},
91+
"x4": {
92+
"type": "vcs",
93+
"url": "[email protected]:creative-commoners/silverstripe-assets"
94+
},
95+
"x5": {
96+
"type": "vcs",
97+
"url": "[email protected]:creative-commoners/silverstripe-elemental"
98+
},
99+
"x6": {
100+
"type": "vcs",
101+
"url": "[email protected]:creative-commoners/silverstripe-versioned"
102+
},
103+
"x7": {
104+
"type": "vcs",
105+
"url": "[email protected]:creative-commoners/developer-docs"
106+
}
107+
},
108+
"conflict": {
109+
"symfony/cache-contracts": "3.2.1",
110+
"symfony/deprecation-contracts": "3.2.1",
111+
"symfony/event-dispatcher-contracts": "3.2.1",
112+
"symfony/service-contracts": "3.2.1",
113+
"symfony/translation-contracts": "3.2.1"
114+
}
66115
}

0 commit comments

Comments
 (0)