Skip to content

Commit

Permalink
Merge branch 'lint-301'
Browse files Browse the repository at this point in the history
  • Loading branch information
tangrufus committed Feb 22, 2020
2 parents 895de7b + 0dab6dd commit 6633370
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* Run `git clean` after checking `git clone` is successful ([#1151](https://github.com/roots/trellis/pull/1151))
* Lint: Fix: `[206] Variables should have spaces before and after: {{ var_name }}` ([#1152](https://github.com/roots/trellis/pull/1152))
* Lint: Fix: `[306] Shells that use pipes should set the pipefail option ([#1153](https://github.com/roots/trellis/pull/1153))
* Lint: Fix `[301] Commands should not change things if nothing needs doing ([#1139](https://github.com/roots/trellis/pull/1139))

### 1.3.0: December 7th, 2019
* Add `git_sha` and `release_version` to `.env` on deploy ([#1124](https://github.com/roots/trellis/pull/1124))
Expand Down
1 change: 1 addition & 0 deletions roles/common/tasks/reload_nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
- name: reload nginx
command: nginx -t
notify: "{{ (role_path | basename == 'common') | ternary('perform nginx reload', omit) }}"
changed_when: true

- name: perform nginx reload
service:
Expand Down
2 changes: 2 additions & 0 deletions roles/rollback/tasks/prior-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
chdir: "{{ project_root }}"
executable: /bin/bash
register: current_release_position
changed_when: false

- name: Fail if current release is the oldest available release
fail:
Expand All @@ -18,6 +19,7 @@
args:
chdir: "{{ project_root }}"
register: releases
changed_when: false

- name: Create new_release_path variable
set_fact:
Expand Down
1 change: 1 addition & 0 deletions roles/rollback/tasks/user-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
args:
chdir: "{{ project_root }}"
register: current_release
changed_when: false

- name: Fail if user-specified release doesn't exist or is already active
fail:
Expand Down
1 change: 1 addition & 0 deletions roles/xdebug-tunnel/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
become: no
register: xdebug_tunnel
ignore_errors: true
changed_when: true

- name: Interpret and present Xdebug SSH tunnel errors
fail:
Expand Down

0 comments on commit 6633370

Please sign in to comment.