Skip to content

Commit 354d6f1

Browse files
committed
.
1 parent ecc6cb3 commit 354d6f1

File tree

3 files changed

+12601
-8
lines changed

3 files changed

+12601
-8
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

+38-8
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",
@@ -35,14 +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"
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/cms": "dev-pulls/6.0/campaign-admin2 as 6.0.x-dev",
46+
"silverstripe/asset-admin": "dev-pulls/3.0/campaign-admin as 3.0.x-dev"
4647
},
4748
"extra": {
4849
"project-files": [
@@ -58,9 +59,38 @@
5859
"allow-plugins": {
5960
"composer/installers": true,
6061
"silverstripe/recipe-plugin": true,
61-
"silverstripe/vendor-plugin": true
62+
"silverstripe/vendor-plugin": true,
63+
"dealerdirect/phpcodesniffer-composer-installer": true
64+
},
65+
"platform": {
66+
"php": "8.3"
6267
}
6368
},
6469
"prefer-stable": true,
65-
"minimum-stability": "dev"
70+
"minimum-stability": "dev",
71+
"repositories": {
72+
"x0": {
73+
"type": "vcs",
74+
"url": "[email protected]:creative-commoners/silverstripe-campaign-admin"
75+
},
76+
"x1": {
77+
"type": "vcs",
78+
"url": "[email protected]:creative-commoners/silverstripe-cms"
79+
},
80+
"x2": {
81+
"type": "vcs",
82+
"url": "[email protected]:creative-commoners/silverstripe-asset-admin"
83+
},
84+
"x3": {
85+
"type": "vcs",
86+
"url": "[email protected]:creative-commoners/developer-docs"
87+
}
88+
},
89+
"conflict": {
90+
"symfony/cache-contracts": "3.2.1",
91+
"symfony/deprecation-contracts": "3.2.1",
92+
"symfony/event-dispatcher-contracts": "3.2.1",
93+
"symfony/service-contracts": "3.2.1",
94+
"symfony/translation-contracts": "3.2.1"
95+
}
6696
}

0 commit comments

Comments
 (0)