fix dist production (#704)

Author: dawehner

.circleci/config.yml

@@ -88,11 +88,13 @@ jobs:
     machine: true
     steps:
       - setup-project
+      - run:
+          name: Buld projects
+          command: yarn build
       - run:
           name: Run tests
           command: |
             docker exec -it drupal_admin_ui_drupal drush user:password admin admin
-            yarn build
             REACT_APP_DRUPAL_BASE_URL=http://drupal NIGHTWATCH_LOGIN_admin_PASSWORD=admin yarn test
       - store_test_results:
           path: ~/project/packages/admin-ui/reports
@@ -113,57 +115,48 @@ jobs:
     machine: true
     steps:
       - setup-project
-
-      # This pushes to https://github.com/jsdrupal/drupal-admin-ui-dist
-      # which is then distributed to https://packagist.org/packages/justafish/drupal-admin-ui
       - run:
-          name: Fix permissions
-          command:  sudo chown -R circleci:circleci ~/project/packages/admin-ui/build
+          name: Build admin-ui package
+          command: yarn workspace @drupal/admin-ui build
       - run:
           name: Copy composer file
           command: cp ~/project/.circleci/drupal-admin-ui--composer.json ~/project/packages/admin-ui/build/composer.json
+      # This pushes to https://github.com/jsdrupal/drupal-admin-ui-dist
+      # which is then distributed to https://packagist.org/packages/justafish/drupal-admin-ui
       - commit-and-push:
           files: ~/project/packages/admin-ui/build
           destination_repo: git@github.com:jsdrupal/drupal-admin-ui-dist.git
           ssh_key_fingerprint: "82:b8:cc:fe:02:24:17:b1:31:ba:dc:30:e1:01:7a:df"
-
       # This pushes to https://github.com/jsdrupal/drupal-admin-ui-support-dist
       # which is then distributed at https://packagist.org/packages/justafish/drupal-admin-ui-support
-      - run:
-          name: Fix permissions
-          command:  sudo chown -R circleci:circleci ~/project/admin_ui_support
       - commit-and-push:
           files: ~/project/admin_ui_support
           destination_repo: git@github.com:jsdrupal/drupal-admin-ui-support-dist.git
           ssh_key_fingerprint: "6c:c9:15:82:34:e7:30:e2:91:1b:ea:e2:06:b2:cf:e0"
-
       # This builds to https://github.com/jsdrupal/drupal-admin-ui-demo for the composer create-project demo
       # which is distributed from https://packagist.org/packages/jsdrupal/drupal-admin-ui-demo
       - run:
           name: Reset composer.json and composer.lock
           command: |
-            docker exec -it drupal_admin_ui_drupal rm -f composer.json composer.lock
-            docker exec -it drupal_admin_ui_drupal cp templates/composer.json composer.json
-            docker exec -it drupal_admin_ui_drupal cp templates/composer.lock composer.lock
-            docker exec -it drupal_admin_ui_drupal rm -rf templates
+            rm -f composer.json composer.lock
+            cp templates/composer.json composer.json
+            cp templates/composer.lock composer.lock
+            rm -rf templates
       # Reset vfancy, otherwise composer will complain that "The .git directory is missing from docroot/vfancy"
       # and won't run update
       - run:
           name: Reset vfancy
           command: |
-            docker exec -it drupal_admin_ui_drupal rm -rf docroot/vfancy/*
-            docker exec -it drupal_admin_ui_drupal /bin/sh -c "cd docroot/vfancy && \
-              git init && \
-              git remote add origin https://github.com/jsdrupal/drupal-admin-ui-dist.git && \
-              git remote add composer https://github.com/jsdrupal/drupal-admin-ui-dist.git && \
-              git fetch origin && \
-              git reset --hard origin/master"
+            rm -rf docroot/vfancy/*
+            cd docroot/vfancy
+            git init
+            git remote add origin https://github.com/jsdrupal/drupal-admin-ui-dist.git
+            git remote add composer https://github.com/jsdrupal/drupal-admin-ui-dist.git
+            git fetch origin
+            git reset --hard origin/master
       - run:
           name: Refresh composer.lock to point to new admin-ui-support commit
           command: docker exec -it drupal_admin_ui_drupal composer update justafish/drupal-admin-ui-support --lock
-      - run:
-          name: Fix permissions
-          command: sudo chown -R circleci:circleci ~/project/demo
       - commit-and-push:
           message: "Auto update from master"
           files: ~/project/demo