Merge pull request #272 from vccw-team/improve-playbook

Improve playbook
vccw-team · Sep 9, 2017 · dbc1d18 · dbc1d18
2 parents 1905c3f + 2cc320a
commit dbc1d18
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,8 @@ env:
   global:
   - VM_DIR=/vagrant
   matrix:
-  - VCCW_ENV='{ "ruby_gems":[], "wp_cli_packages":[] }'
-  - 'VCCW_ENV=''{ "ruby_gems":[], "wp_cli_packages":[], "lang": "ja", "plugins": [ "simple-map" ], "theme": "twentyfifteen"}'''
+  - VCCW_ENV='{ "ruby_gems":[], "wp_cli_packages":[], "mailcatcher":false }'
+  - 'VCCW_ENV=''{ "ruby_gems":[], "wp_cli_packages":[], "lang": "ja", "plugins": [ "simple-map" ], "theme": "twentyfifteen", "mailcatcher":false }'''
 before_install:
 - bundle install --path vendor/bundle
 - "/usr/bin/env bash bin/run-docker.sh"

diff --git a/provision/playbooks/wordpress.yml b/provision/playbooks/wordpress.yml
@@ -124,26 +124,11 @@
       --path={{ path }}
     when: vccw.lang == 'ja'
 
-  # Check exsist Theme
-  - name: Run `wp theme is-installed`
-    command: |
-      wp theme is-installed {{ vccw.theme }}
-      --path={{ path }}
-    register: theme_is_installed
-    ignore_errors: True
-    when: vccw.theme != ''
-
   # Install Theme
   - name: Run `wp theme install`
     command: |
       wp theme install {{ vccw.theme }}
-      --path={{ path }} --activate
-    when: vccw.theme != '' and theme_is_installed.rc == 1
-
-  - name: Run `wp theme activate`
-    command: |
-      wp theme activate {{ vccw.theme }}
-      --path={{ path }}
+      --path={{ path }} --activate --force
     when: vccw.theme != ''
 
   # Import Theme Unit Test Data