Skip to content

Commit f35b08f

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

File tree

3 files changed

+12509
-4
lines changed

3 files changed

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

+23-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,9 @@
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"
3941
},
4042
"require-dev": {
4143
"silverstripe/frameworktest": "^2",
@@ -54,6 +56,9 @@
5456
]
5557
},
5658
"config": {
59+
"platform": {
60+
"php": "8.3"
61+
},
5762
"process-timeout": 600,
5863
"allow-plugins": {
5964
"composer/installers": true,
@@ -62,5 +67,19 @@
6267
}
6368
},
6469
"prefer-stable": true,
65-
"minimum-stability": "dev"
66-
}
70+
"minimum-stability": "dev",
71+
"repositories": {
72+
"silverstripe/framework": {
73+
"type": "vcs",
74+
"url": "[email protected]:creative-commoners/silverstripe-framework.git"
75+
},
76+
"silverstripe/versioned": {
77+
"type": "vcs",
78+
"url": "[email protected]:creative-commoners/silverstripe-versioned.git"
79+
},
80+
"silverstripe/hybridsessions": {
81+
"type": "vcs",
82+
"url": "[email protected]:creative-commoners/silverstripe-hybridsessions.git"
83+
}
84+
}
85+
}

0 commit comments

Comments
 (0)