8.2.21

- fixed composer namespace to lowercase - Updated dev dependencies (#148)
SU-SWS · Jul 8, 2022 · 1bdf8d7 · 1bdf8d7
2 parents cac6ac0 + 392b267
commit 1bdf8d7
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 42 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,37 +14,14 @@ defaults: &defaults
         MYSQL_ALLOW_EMPTY_PASSWORD: 1
   working_directory: /var/www/html
 
-#Jobs
-code_coverage: &code_coverage
-  <<: *defaults
-  steps:
-    - restore_cache:
-        keys:
-          - dependencies-v1
-    - checkout:
-        path: /var/www/test
-    - run:
-        name: Run PHP Unit Coverage Tests
-        command: |
-          composer global require SU-SWS/stanford-caravan:dev-8.x-2.x
-          ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=/var/www/test --with-coverage
-    - save_cache:
-        key: dependencies-v1-{{ epoch }}
-        paths:
-          - .
-    - store_test_results:
-        path: /var/www/html/artifacts/phpunit
-    - store_artifacts:
-        path: /var/www/html/artifacts/phpunit/coverage
-
 back_to_dev: &back_to_dev
   <<: *defaults
   steps:
     - checkout
     - run:
         name: Back to dev
         command: |
-          composer global require SU-SWS/stanford-caravan:dev-8.x-2.x
+          composer global require su-sws/stanford-caravan:dev-8.x-2.x
           ~/.composer/vendor/bin/sws-caravan back-to-dev ${CIRCLE_TAG} ${CIRCLE_WORKING_DIRECTORY}
 
 d9_codeception: &d9_codeception
@@ -55,17 +32,15 @@ d9_codeception: &d9_codeception
     - run:
         name: Run Codeception Tests
         command: |
-          composer global require SU-SWS/stanford-caravan:dev-8.x-2.x
-          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=/var/www/test
+          composer global require su-sws/stanford-caravan:dev-8.x-2.x
+          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=/var/www/test --suites=functional
     - store_test_results:
         path: /var/www/html/artifacts/behat
     - store_artifacts:
         path: /var/www/html/artifacts
 
 # Declare all of the jobs we should run.
 jobs:
-  run-coverage:
-    <<: *code_coverage
   run-back-to-dev:
     <<: *back_to_dev
   run-d9-codeception:
@@ -86,16 +61,5 @@ workflows:
                 - /.*/
   tests:
     jobs:
-      - run-coverage
-      - run-d9-codeception
-  # Re-test every sunday in case this code becomes stale.
-  sundays:
-    jobs:
-      - run-coverage
-    triggers:
-      - schedule:
-          cron: "0 0 * * 0"
-          filters:
-            branches:
-              only:
-                - 8.x-1.x
+      - run-d9-codeception:
+          context: github-auth
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,59 @@
+name: PHPUnit and Acceptance Tests
+on: [push]
+jobs:
+  phpunit:
+    name: PHPUnit Coverage Tests
+    runs-on: ubuntu-latest
+    container:
+      image: pookmish/drupal8ci:php8
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_DATABASE: drupal
+          MYSQL_USER: drupal
+          MYSQL_PASSWORD: drupal
+          MYSQL_ROOT_PASSWORD: drupal
+        ports:
+          - 33306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: project
+      - name: Build project
+        env:
+          CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
+        run: |
+          composer global require su-sws/stanford-caravan:dev-8.x-2.x
+          ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --with-coverage
+
+  acceptance:
+    name: Codeception Acceptance Tests
+    runs-on: ubuntu-latest
+    env:
+      DRUPAL_DATABASE_NAME: drupal
+      DRUPAL_DATABASE_USERNAME: drupal
+      DRUPAL_DATABASE_PASSWORD: drupal
+      DRUPAL_DATABASE_HOST: mysql
+    container:
+      image: pookmish/drupal8ci:php8
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_DATABASE: drupal
+          MYSQL_USER: drupal
+          MYSQL_PASSWORD: drupal
+          MYSQL_ROOT_PASSWORD: drupal
+        ports:
+          - 33306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: project
+      - name: Run tests
+        run: |
+          composer global require su-sws/stanford-caravan:dev-8.x-2.x
+          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=acceptance
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # Stanford News
 
 
+8.2.21
+--------------------------------------------------------------------------------
+_Release Date: 2022-07-08_
+
+- fixed composer namespace to lowercase
+- Updated dev dependencies (#148)
+
+
 8.x-2.20
 --------------------------------------------------------------------------------
 _Release Date: 2022-03-22_

diff --git a/stanford_news.info.yml b/stanford_news.info.yml
@@ -3,7 +3,7 @@ type: module
 description: 'Stanford news items and views.'
 core_version_requirement: ^8.8 || ^9
 package: Stanford
-version: 8.x-2.20
+version: 8.x-2.21
 dependencies:
   - allowed_formats:allowed_formats
   - auto_entitylabel:auto_entitylabel