Skip to content

Commit 28f4bd1

Browse files
committed
NO MERGE: CI run only
1 parent ced8280 commit 28f4bd1

File tree

3 files changed

+15833
-7
lines changed

3 files changed

+15833
-7
lines changed

.github/workflows/ci.yml

+46-4
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
@@ -20,9 +21,50 @@ jobs:
2021
# Run recipe-cms testsuite because that's the most likely to have weird conflicts e.g. graphql
2122
extra_jobs: |
2223
- php: 8.1
23-
composer_args: --prefer-lowest
24-
phpunit: true
25-
phpunit_suite: recipe-cms
26-
- php: 8.2
2724
phpunit: true
2825
phpunit_suite: recipe-cms
26+
## Added behat tests:
27+
- php: 8.1
28+
endtoend: true
29+
endtoend_suite: silverstripe-elemental
30+
endtoend_config: vendor/dnadesign/silverstripe-elemental/behat.yml
31+
- php: 8.1
32+
endtoend: true
33+
endtoend_suite: silverstripe-elemental-userforms
34+
endtoend_config: vendor/dnadesign/silverstripe-elemental-userforms/behat.yml
35+
- php: 8.1
36+
endtoend: true
37+
endtoend_suite: admin
38+
endtoend_config: vendor/silverstripe/admin/behat.yml
39+
- php: 8.1
40+
endtoend: true
41+
endtoend_suite: cms
42+
endtoend_config: vendor/silverstripe/cms/behat.yml
43+
- php: 8.1
44+
endtoend: true
45+
endtoend_suite: contentreview
46+
endtoend_config: vendor/silverstripe/contentreview/behat.yml
47+
- php: 8.1
48+
endtoend: true
49+
endtoend_suite: elemental-bannerblock
50+
endtoend_config: vendor/silverstripe/elemental-bannerblock/behat.yml
51+
- php: 8.1
52+
endtoend: true
53+
endtoend_suite: elemental-fileblock
54+
endtoend_config: vendor/silverstripe/elemental-fileblock/behat.yml
55+
- php: 8.1
56+
endtoend: true
57+
endtoend_suite: subsites
58+
endtoend_config: vendor/silverstripe/subsites/behat.yml
59+
- php: 8.1
60+
endtoend: true
61+
endtoend_suite: taxonomy
62+
endtoend_config: vendor/silverstripe/taxonomy/behat.yml
63+
- php: 8.1
64+
endtoend: true
65+
endtoend_suite: userforms
66+
endtoend_config: vendor/silverstripe/userforms/behat.yml
67+
- php: 8.1
68+
endtoend: true
69+
endtoend_suite: versioned-admin
70+
endtoend_config: vendor/silverstripe/versioned-admin/behat.yml

composer.json

+13-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
"colymba/gridfield-bulk-editing-tools": "4.x-dev",
4242
"tractorcow/silverstripe-fluent": "7.x-dev",
4343
"silverstripe/dynamodb": "5.x-dev",
44-
"silverstripe/linkfield": "4.x-dev"
44+
"silverstripe/linkfield": "4.x-dev",
45+
"silverstripe/framework": "dev-pulls/5/pjax-in-gridfield as 5.9999999.9999999.9999999-dev"
4546
},
4647
"require-dev": {
4748
"silverstripe/frameworktest": "^1",
@@ -59,6 +60,9 @@
5960
]
6061
},
6162
"config": {
63+
"platform": {
64+
"php": "8.1"
65+
},
6266
"process-timeout": 600,
6367
"allow-plugins": {
6468
"composer/installers": true,
@@ -67,5 +71,11 @@
6771
}
6872
},
6973
"prefer-stable": true,
70-
"minimum-stability": "dev"
71-
}
74+
"minimum-stability": "dev",
75+
"repositories": {
76+
"silverstripe/framework": {
77+
"type": "vcs",
78+
"url": "[email protected]:creative-commoners/silverstripe-framework.git"
79+
}
80+
}
81+
}

0 commit comments

Comments
 (0)