diff --git a/src/examples/example.yml b/src/examples/example.yml index 0239003..5f0d8f1 100755 --- a/src/examples/example.yml +++ b/src/examples/example.yml @@ -15,8 +15,8 @@ usage: context: skpr-example executor: name: drupal/node - tag: 14-1.x - theme_path: app/themes/mytheme + tag: 20-v2-edge + storybook_path: app/storybook library_path: app/libraries/mylibrary - drupal/build_backend: context: skpr-example diff --git a/src/jobs/build_frontend.yml b/src/jobs/build_frontend.yml index 9e34611..0556671 100644 --- a/src/jobs/build_frontend.yml +++ b/src/jobs/build_frontend.yml @@ -1,17 +1,16 @@ description: | - Build the Drupal front-end. + Build the front-end. - The following Make targets are required and will be called: - - init-frontend - - lint-frontend - - build-frontend + The following npm commands are required and will be called: + - npm run lint + - npm run build parameters: executor: type: executor description: The executor to use. - theme_path: - description: The Drupal theme path. + storybook_path: + description: The Storybook build path. type: string library_path: description: The Drupal library path. @@ -22,26 +21,22 @@ parameters: description: Initialise the front-end dependencies. default: - run: - name: Init - command: make init-frontend + name: Install + command: npm -q ci lint: type: steps description: Check the codebase against style guidelines. default: - run: name: Lint - command: make lint-frontend + command: npm run lint build: type: steps description: Build the front-end components. default: - run: name: Build - command: make build-frontend - unit-test: - type: steps - description: Run the front-end unit tests. - default: [] + command: npm run build cache-version: description: An optional version number for cache dependencies, e.g. v1 type: string @@ -61,12 +56,9 @@ steps: - ~/.npm - steps: <> - steps: <> - - steps: <> - persist_to_workspace: root: /data paths: - - app/styleguide + - <> - <> - - <>/css - - <>/js - node_modules diff --git a/src/jobs/test.yml b/src/jobs/test.yml index bb8ba63..4b57160 100644 --- a/src/jobs/test.yml +++ b/src/jobs/test.yml @@ -4,7 +4,6 @@ description: | The following Make targets will be called by default: - deploy - test-init - - ci-nightwatch The default test step assumes you have installed the https://packagist.org/packages/previousnext/phpunit-finder package. @@ -37,9 +36,6 @@ parameters: - run: name: "Test: Application" command: for i in `./bin/phpunit-finder | circleci tests split --split-by=timings`; do /bin/bash -c "./bin/phpunit $i --log-junit $(pwd)/build/logs/phpunit/$(basename $i).xml"; done - - run: - name: "Test: Nightwatch" - command: make ci-nightwatch post-test: type: steps description: Provide any optional post-test steps you would like to run. @@ -69,7 +65,4 @@ steps: - store_artifacts: path: app/sites/simpletest destination: tr1 - - store_artifacts: - path: build/logs/nightwatch - destination: tr1 - steps: <>