Merge pull request #269 from wpengine/ryanmeier/small-circleci-fixes

[NO JIRA] Updates To CircleCI Config

Author: rfmeier

.circleci/config.yml

@@ -137,13 +137,16 @@ jobs:
       CONTAINER_WP_VERSION: "latest"
       CONTAINER_PHP_VERSION: "7.3"
   deploy_job:
+    working_directory: /root/project/phpcompat-demo
     docker:
-      - image: circleci/buildpack-deps:latest
+      - image: wordpress:php7.3-fpm-alpine
     steps:
+      - run: apk add --no-cache git subversion rsync
+      - *install_composer
       - checkout
       - run:
-          name: Install dependencies
-          command: sudo apt-get install rsync -qq
+          name: Install composer without dev packages
+          command: composer install --no-dev --no-suggest --optimize-autoloader
       - run:
           name: Create artifacts directory
           command: mkdir -p /tmp/artifacts
@@ -157,8 +160,10 @@ workflows:
   version: 2
   test:
     jobs:
-      - job_test_javascript
+      - job_test_javascript:
+          <<: *workflow_job
       - job_php_code_standards:
+          <<: *workflow_job
           requires:
             - job_test_javascript
       - job_test_php56_min:

.circleci/deploy.sh

@@ -44,7 +44,7 @@ svn update --set-depth infinity trunk
 echo "Copying files..."
 
 if [[ -f "$PROJECT_DIR/.distignore" ]]; then
-    rsync -rc --exclude-from="$PROJECT_DIR/.distignore" "$PROJECT_DIR/" trunk/ --delete --delete-excluded
+    rsync -rcl --exclude-from="$PROJECT_DIR/.distignore" "$PROJECT_DIR/" trunk/ --delete --delete-excluded
 fi
 
 # Copy assets to /assets.

.distignore

@@ -0,0 +1,23 @@
++ php52/vendor/bin
++ vendor/bin
+- bin
+.circleci
+.distignore
+.git
+.gitignore
+.phplint.yml
+Dockerfile
+Gruntfile.js
+Makefile
+build.sh
+composer.json
+composer.lock
+docker-compose.yml
+helpers
+package-lock.json
+package.json
+php-lint.sh
+phpunit.xml.dist
+readme.md
+tests
+assets