Merge pull request #86 from creative-commoners/pulls/6.0/campaign-admin

ENH Add campaign-admin support back in
silverstripe · Mar 11, 2025 · 765f93c · 765f93c
2 parents ecc6cb3 + 0249fac
commit 765f93c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -98,6 +98,10 @@ jobs:
           endtoend: true
           endtoend_suite: blog
           endtoend_config: vendor/silverstripe/blog/behat.yml
+        - php: 8.3
+          endtoend: true
+          endtoend_suite: campaign-admin
+          endtoend_config: vendor/silverstripe/campaign-admin/behat.yml
         - php: 8.3
           endtoend: true
           endtoend_suite: cms

diff --git a/composer.json b/composer.json
@@ -35,7 +35,8 @@
         "silverstripe/graphql": "6.0.x-dev",
         "silverstripe/subsites": "4.0.x-dev",
         "silverstripe/blog": "5.0.x-dev",
-        "silverstripe/crontask": "4.0.x-dev"
+        "silverstripe/crontask": "4.0.x-dev",
+        "silverstripe/campaign-admin": "3.0.x-dev"
     },
     "require-dev": {
         "silverstripe/frameworktest": "^2",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -36,6 +36,7 @@
         </testsuite>
 
         <testsuite name="g2">
+            <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
             <directory>vendor/silverstripe/hybridsessions/tests</directory>
             <directory>vendor/silverstripe/tagfield/tests</directory>
             <directory>vendor/silverstripe/taxonomy/tests</directory>