NO MERGE - FOR CI ONLY

creative-commoners · Mar 13, 2024 · fddcc03 · fddcc03
1 parent d0c1525
commit fddcc03
Show file tree

Hide file tree

Showing 4 changed files with 8,924 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,18 +10,9 @@ 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
       # 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
-          endtoend_suite: asset-admin
-          endtoend_config: vendor/silverstripe/asset-admin/behat.yml
-        - endtoend: true
-          endtoend_suite: cms
-          endtoend_config: vendor/silverstripe/cms/behat.yml
diff --git a/composer.json b/composer.json
@@ -8,10 +8,16 @@
         "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/linkfield": "dev-pulls/4/migration-from-v2or3 as 4.0.9999999.9999999-dev",
+        "silverstripe/framework": "dev-pulls/5.2/test-non-cli as 5.2.9999999.9999999-dev"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6"
+        "dnadesign/silverstripe-elemental": "^5",
+        "phpunit/phpunit": "^9.6",
+        "silverstripe/recipe-testing": "^3",
+        "silverstripe/frameworktest": "^1",
+        "mikey179/vfsstream": "^1.6.10"
     },
     "extra": {
         "project-files": [
@@ -25,6 +31,9 @@
         ]
     },
     "config": {
+        "platform": {
+            "php": "8.1"
+        },
         "process-timeout": 600,
         "allow-plugins": {
             "composer/installers": true,
@@ -33,5 +42,15 @@
         }
     },
     "prefer-stable": true,
-    "minimum-stability": "dev"
-}
+    "minimum-stability": "dev",
+    "repositories": {
+        "silverstripe/linkfield": {
+            "type": "vcs",
+            "url": "git@github.com:creative-commoners/silverstripe-linkfield.git"
+        },
+        "silverstripe/framework": {
+            "type": "vcs",
+            "url": "git@github.com:creative-commoners/silverstripe-framework.git"
+        }
+    }
+}