Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "build-before: Checkout project source code to local temporary directory" #1006

Merged
merged 1 commit into from
Jun 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
### HEAD
* build-before: Checkout project source code to local temporary directory ([#997](https://github.com/roots/trellis/pull/997))
* Verify `wp-cli.phar` checksum ([#996](https://github.com/roots/trellis/pull/996))
* Enable `fastcgi_cache_background_update` by default ([#962](https://github.com/roots/trellis/pull/962))
* Bump Ansible `version_tested_max` to 2.5.3 ([#981](https://github.com/roots/trellis/pull/981))
Expand Down
15 changes: 3 additions & 12 deletions deploy-hooks/build-before.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,11 @@
# Uncomment the lines below and replace `sage` with your theme folder
#
# ---
# - name: Clone project files
# git:
# repo: "{{ project_git_repo }}"
# version: "{{ project_version }}"
# dest: "{{ project_build_path }}"
# force: yes
# no_log: true
# connection: local
#
# - name: Install npm dependencies
# command: yarn
# connection: local
# args:
# chdir: "{{ project_build_path }}/web/app/themes/sage"
# chdir: "{{ project_local_path }}/web/app/themes/sage"
#
# - name: Install Composer dependencies
# command: composer install --no-ansi --no-dev --no-interaction --no-progress --optimize-autoloader --no-scripts
Expand All @@ -31,11 +22,11 @@
# command: yarn build:production
# connection: local
# args:
# chdir: "{{ project_build_path }}/web/app/themes/sage"
# chdir: "{{ project_local_path }}/web/app/themes/sage"
#
# - name: Copy production assets
# synchronize:
# src: "{{ project_build_path }}/web/app/themes/sage/dist"
# src: "{{ project_local_path }}/web/app/themes/sage/dist"
# dest: "{{ deploy_helper.new_release_path }}/web/app/themes/sage"
# group: no
# owner: no
Expand Down
3 changes: 2 additions & 1 deletion roles/deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ update_db_on_deploy: true
# Helpers
project: "{{ wordpress_sites[site] }}"
project_root: "{{ www_root }}/{{ site }}"
project_build_path: "{{ lookup('env', 'TMPDIR') | default('/tmp/', true) }}trellis/{{ site }}/{{ env }}"
project_local_path: "{{ (lookup('env', 'USER') == 'vagrant') | ternary(project_root + '/' + project_current_path, project.local_path) }}"


# Deploy hooks
# For list of hooks and explanation, see https://roots.io/trellis/docs/deploys/#hooks
Expand Down