Skip to content

Commit

Permalink
NO MERGE - CI ONLY
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed Jul 30, 2024
1 parent 90e14a5 commit 1b822e9
Show file tree
Hide file tree
Showing 3 changed files with 8,664 additions and 11 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,17 @@ jobs:
name: CI
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with:
composer_install: true
# installer contains a sample behat.yml file, though there are no behat tests to run
endtoend: false
phpunit: false
dynamic_matrix: false
# require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
# regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
composer_require_extra: silverstripe/recipe-testing:^3 silverstripe/frameworktest:^1 mikey179/vfsstream:^1.6.10
extra_jobs: |
- endtoend: true
endtoend_suite: admin
endtoend_config: vendor/silverstripe/admin/behat.yml
- endtoend: true
- php: 8.1
endtoend: true
endtoend_suite: asset-admin
endtoend_config: vendor/silverstripe/asset-admin/behat.yml
- endtoend: true
endtoend_suite: cms
endtoend_config: vendor/silverstripe/cms/behat.yml
endtoend_tags: job0
21 changes: 17 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
"silverstripe/vendor-plugin": "2.0.x-dev",
"silverstripe/recipe-cms": "5.2.x-dev",
"silverstripe-themes/simple": "3.3.x-dev",
"silverstripe/login-forms": "5.2.x-dev"
"silverstripe/login-forms": "5.2.x-dev",
"silverstripe/asset-admin": "dev-pulls/2/ci-only as 2.2.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^9.6"
"phpunit/phpunit": "^9.6",
"silverstripe/recipe-testing": "^3",
"silverstripe/frameworktest": "^1",
"mikey179/vfsstream": "^1.6.10"
},
"extra": {
"project-files": [
Expand All @@ -25,6 +29,9 @@
]
},
"config": {
"platform": {
"php": "8.1"
},
"process-timeout": 600,
"allow-plugins": {
"composer/installers": true,
Expand All @@ -33,5 +40,11 @@
}
},
"prefer-stable": true,
"minimum-stability": "dev"
}
"minimum-stability": "dev",
"repositories": {
"silverstripe/asset-admin": {
"type": "vcs",
"url": "[email protected]:creative-commoners/silverstripe-asset-admin.git"
}
}
}
Loading

0 comments on commit 1b822e9

Please sign in to comment.