Skip to content

Commit 439234c

Browse files
committed
NO MERGE - CI ONLY (cookie samesite)
1 parent ecc6cb3 commit 439234c

File tree

3 files changed

+12586
-4
lines changed

3 files changed

+12586
-4
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

+25-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"silverstripe/recipe-plugin": "2.0.x-dev",
1010
"silverstripe/installer": "6.0.x-dev",
1111
"silverstripe/developer-docs": "6.0.x-dev",
12-
"silverstripe/hybridsessions": "4.0.x-dev",
12+
"silverstripe/hybridsessions": "dev-pulls/4.0/cookie-samesite as 4.0.x-dev",
1313
"silverstripe/totp-authenticator": "6.0.x-dev",
1414
"silverstripe/mfa": "6.0.x-dev",
1515
"silverstripe/gridfieldqueuedexport": "4.0.x-dev",
@@ -35,7 +35,11 @@
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/cookie-samesite as 6.0.9999999.9999999-dev",
40+
"silverstripe/versioned": "dev-pulls/3.0/cookie-samesite as 3.0.9999999.9999999-dev",
41+
"silverstripe/campaign-admin": "3.0.x-dev",
42+
"silverstripe/supported-modules": "^1.1"
3943
},
4044
"require-dev": {
4145
"silverstripe/frameworktest": "^2",
@@ -54,6 +58,9 @@
5458
]
5559
},
5660
"config": {
61+
"platform": {
62+
"php": "8.3"
63+
},
5764
"process-timeout": 600,
5865
"allow-plugins": {
5966
"composer/installers": true,
@@ -62,5 +69,19 @@
6269
}
6370
},
6471
"prefer-stable": true,
65-
"minimum-stability": "dev"
66-
}
72+
"minimum-stability": "dev",
73+
"repositories": {
74+
"silverstripe/framework": {
75+
"type": "vcs",
76+
"url": "[email protected]:creative-commoners/silverstripe-framework.git"
77+
},
78+
"silverstripe/versioned": {
79+
"type": "vcs",
80+
"url": "[email protected]:creative-commoners/silverstripe-versioned.git"
81+
},
82+
"silverstripe/hybridsessions": {
83+
"type": "vcs",
84+
"url": "[email protected]:creative-commoners/silverstripe-hybridsessions.git"
85+
}
86+
}
87+
}

0 commit comments

Comments
 (0)