Move test around

archiprocode · Nov 7, 2024 · 62fae7e · 62fae7e
1 parent c668b72
commit 62fae7e
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,37 +2,28 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
   workflow_dispatch:
 
 jobs:
-  tests:
-    name: PHP ${{ matrix.php }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php: ['8.1', '8.2', '8.3']
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: none
-          tools: composer:v2
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress
-
-      - name: Run tests
-        run: vendor/bin/phpunit
-
-      - name: Static Analysis
-        run: vendor/bin/phpstan analyse
+  ci:
+    name: CI
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
+    with:
+      dynamic_matrix: false
+      extra_jobs: |
+        - php: '8.1'
+          db: mysql80
+          phpunit: true
+          installer_version: ^4
+        - php: '8.2'
+          db: mysql80
+          phpunit: true
+          installer_version: ^5
+        - php: '8.2'
+          db: mariadb
+          phpunit: true
+          installer_version: ^5
 
   coding-standards:
     name: Coding Standards

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "ArchiPro\\Silverstripe\\EventDispatcher\\Tests\\": "tests/"
+            "ArchiPro\\Silverstripe\\EventDispatcher\\Tests\\": "tests/php/"
         }
     },
     "scripts": {

diff --git a/tests/Event/AbstractDataObjectEventTest.php → ...php/Event/AbstractDataObjectEventTest.php b/tests/Event/AbstractDataObjectEventTest.php → ...php/Event/AbstractDataObjectEventTest.php
diff --git a/tests/Event/DataObjectEventTest.php → tests/php/Event/DataObjectEventTest.php b/tests/Event/DataObjectEventTest.php → tests/php/Event/DataObjectEventTest.php
diff --git a/tests/Event/DataObjectEventTest.yml → tests/php/Event/DataObjectEventTest.yml b/tests/Event/DataObjectEventTest.yml → tests/php/Event/DataObjectEventTest.yml
diff --git a/tests/Event/DataObjectVersionEventTest.php → .../php/Event/DataObjectVersionEventTest.php b/tests/Event/DataObjectVersionEventTest.php → .../php/Event/DataObjectVersionEventTest.php
diff --git a/.../Extension/EventDispatchExtensionTest.php → .../Extension/EventDispatchExtensionTest.php b/.../Extension/EventDispatchExtensionTest.php → .../Extension/EventDispatchExtensionTest.php
diff --git a/.../Extension/EventDispatchExtensionTest.yml → .../Extension/EventDispatchExtensionTest.yml b/.../Extension/EventDispatchExtensionTest.yml → .../Extension/EventDispatchExtensionTest.yml
diff --git a/tests/Mock/SimpleDataObject.php → tests/php/Mock/SimpleDataObject.php b/tests/Mock/SimpleDataObject.php → tests/php/Mock/SimpleDataObject.php
diff --git a/tests/Mock/VersionedDataObject.php → tests/php/Mock/VersionedDataObject.php b/tests/Mock/VersionedDataObject.php → tests/php/Mock/VersionedDataObject.php
diff --git a/tests/Service/EventServiceTest.php → tests/php/Service/EventServiceTest.php b/tests/Service/EventServiceTest.php → tests/php/Service/EventServiceTest.php
diff --git a/tests/TestListenerLoader.php → tests/php/TestListenerLoader.php b/tests/TestListenerLoader.php → tests/php/TestListenerLoader.php