Updated development stack and fixed CI. (#6)

.circleci/config.yml

@@ -1,72 +1,41 @@
 version: 2
 aliases:
-
-  - &build
+  # Re-usable job to run different types of builds.
+  - &job-build
     working_directory: /app
     docker:
-      - image: singledigital/bay-circle:latest
-        environment: &environment
-          COMPOSER_ALLOW_SUPERUSER: 1
-          COMPOSE_PROJECT_NAME: mysite
-          COMPOSE_FILE: docker-compose.yml
-          INSTALL_SUGGEST: 0
-          BEHAT_PROFILE: ""
+      - image: &builder-image integratedexperts/ci-builder
+        environment:
+          INSTALL_NEW_SITE: 1
+          LAGOON_ENVIRONMENT_TYPE: ci
     steps:
       - attach_workspace:
           at: /workspace
       - checkout
+      # Init environment for development.
+      - run: if [ -f "./dev-init.sh" ] && [ ! "$DEV_TOOLS" ]; then ./dev-init.sh; fi
       - setup_remote_docker:
           docker_layer_caching: true
-          version: 17.06.0-ce
-      - run:
-          name: Composer validate
-          # @dev
-          command: composer validate --ansi --strict --no-check-all
-      - run:
-          name: Start containers
-          command: |
-            printenv
-            echo "COMPOSE_FILE=$COMPOSE_FILE" >> .env.local
-            echo "BEHAT_PROFILE=$BEHAT_PROFILE" >> .env.local
-            make docker-start
-      - run:
-          name: Copy files into container
-          command: docker cp -L /app/. $(docker-compose ps -q cli):/app/
-      - run:
-          name: Install dev dependencies
-          command: make install
-      - run:
-          name: Lint code
-          command: make lint
-      - run:
-          name: Prepare test fixtures
-          command: make install-site
-      - run:
-          name: Enable current module and dependencies
-          command: make install-module
-      - run:
-          name: Run tests
-          command: |
-            make test-behat || make test-behat -- --rerun
+      - run: .circleci/build.sh
+      - run: .circleci/test.sh
       - run:
           name: Copy artifacts
-          command: |
-            mkdir -p /tmp/artifacts/behat
-            docker cp $(docker-compose ps -q cli):/app/screenshots /tmp/artifacts/behat
+          command: .circleci/test-artifacts.sh
           when: always
       - store_artifacts:
           path: /tmp/artifacts
 
 jobs:
   build:
-    <<: *build
+    <<: *job-build
 
   build_suggest:
-    <<: *build
+    <<: *job-build
     docker:
-      - image: singledigital/bay-circle:latest
+      - image: *builder-image
         environment:
-          <<: *environment
+          INSTALL_NEW_SITE: 1
+          LAGOON_ENVIRONMENT_TYPE: ci
           INSTALL_SUGGEST: 1
           BEHAT_PROFILE: "--profile=suggest"
 
@@ -75,3 +44,4 @@ workflows:
   main:
     jobs:
       - build
+      - build_suggest

.gitattributes

@@ -1,12 +1,10 @@
 # Ignore files for distribution archives.
-
 .gitattributes            export-ignore
 .gitignore                export-ignore
 .github                   export-ignore
+.circleci                 export-ignore
+.circleci/config.yml      export-ignore
+.env                      export-ignore
 tests                     export-ignore
-circle.yml                export-ignore
 composer.json             export-ignore
-composer.lock             export-ignore
-phpcs.xml                 export-ignore
-phpunit.xml               export-ignore
-xdebug.sh                 export-ignore
+dev-init.sh               export-ignore

.gitignore

@@ -1,8 +1,12 @@
-vendor
-vendor-local
+# To ignore OS temporary files use global .gitignore
+# https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
+
 /composer.lock
-build
+/composer.build.json
+/composer.build.lock
+/docroot
+/dpc-sdp
+.env.local
+docker-compose.override.yml
 screenshots
-composer.dev.json
-composer.build.json
-composer.build.lock
+vendor

README.md

@@ -29,7 +29,3 @@ composer require dpc-sdp/tide_test
 # PURPOSE
 - test content type
 - other test functionality
-
-# Caveats
-
-Tide Test is on the alpha release, use with caution. APIs are likely to change before the stable version, that there will be breaking changes and that we're not supporting it for external production sites at the moment.