Merge pull request #88 from phpsw/feature/circle-ci-2

UPDATE to CircleCI V2

Author: DaveLiddament

.circleci/config.yml

@@ -0,0 +1,102 @@
+version: 2
+
+php-image: &php-image
+  docker:
+  - image: circleci/php:7.1-cli-stretch
+
+
+restore-php-cache: &restore-php-cache
+  restore_cache:
+    keys:
+    - php-vendors-v1-{{ checksum "yarn.lock"}}
+    - php-vendors-v1
+
+composer-install: &composer-install
+  run:
+    name: Composer install
+    command: composer install  --no-interaction --no-scripts --prefer-dist
+
+save-php-cache: &save-php-cache
+ save_cache:
+   key: php-vendors-v1-{{ checksum "composer.lock" }}
+   paths:
+   - vendor
+
+
+jobs:
+  node:
+    docker:
+    - image: circleci/node:8
+
+    steps:
+    - checkout
+    - restore_cache:
+        keys:
+        - npm-vendors-v1-{{ checksum "yarn.lock"}}
+        - npm-vendors-v1
+
+    - run:
+        name: Yarn install
+        command: yarn install
+
+    - save_cache:
+        key: npm-vendors-{{ checksum "yarn.lock"}}
+        paths:
+        - node_modules
+
+    - run:
+        name: Run front end build
+        command: yarn prod
+
+
+  php:
+    <<: *php-image
+
+    steps:
+    - checkout
+    - *restore-php-cache
+    - *composer-install
+    - *save-php-cache
+    - run:
+        name: Create test version of secrets.yml
+        command: cp app/config/secrets_test.yml app/config/secrets.yml
+    - run:
+        name: Run CI
+        command: composer ci
+
+    - store-test-results:
+        path: reports
+
+  security:
+    <<: *php-image
+
+    steps:
+    - checkout
+    - *restore-php-cache
+    - *composer-install
+    - *save-php-cache
+
+    - run:
+        name: PHP security check
+        command: composer security
+
+
+workflows:
+  version: 2
+  commit:
+    jobs:
+    - node
+    - php
+    - security
+
+
+  security-check:
+    triggers:
+    - schedule:
+        cron: "33 12 * * *"
+        filters:
+          branches:
+            only: develop
+
+    jobs:
+    - security

ci/run.sh

@@ -38,5 +38,23 @@
         "psr-4" : {
           "Phpsw\\Website\\Tests\\" : "app/test/"
         }
+    },
+    "scripts": {
+        "ci" : [
+          "@composer-validate",
+          "@lint",
+          "@cs",
+          "@test",
+          "@validate-data",
+          "@generate-website"
+        ],
+        "composer-validate" : "@composer validate --no-check-all --strict",
+        "lint" : "parallel-lint app runner.php",
+        "cs" : "php-cs-fixer fix -v --dry-run --verbose --format=junit > reports/phpcs/junit.xml",
+        "cs-fix" : "php-cs-fixer fix -v",
+        "test" : "phpunit --log-junit reports/phpunit/junit.xml",
+        "validate-data" : "php runner.php phpsw:validate-data",
+        "generate-website" : "php runner.php phpsw:generate-website",
+        "security" : "security-checker security:check"
     }
 }

circle.yml

@@ -53,8 +53,11 @@ This assumes:
 - local hosts is setup (see getting started)
 
 
+## Auto fixing coding standards
+Prior to every commit execute ```composer cs-fix``` from within the VM. This will fix any code style issues.
+
 ## CI
-Execute ```ci/run.sh``` from within the VM to run the CI tests locally.
+Execute ```composer ci``` from within the VM to run the CI tests locally.
 
 
 ## Architecture

composer.json

@@ -0,0 +1,4 @@
+*
+!.gitignore
+!phpcs
+!phpunit

composer.lock

@@ -0,0 +1,2 @@
+*
+!.gitignore

readme.md

@@ -0,0 +1,2 @@
+*
+!.gitignore