diff options
author | paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> | 2018-11-30 17:05:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-30 17:05:17 +0100 |
commit | e1ffebc7abc311393dfca85495a5c90ffe6dad04 (patch) | |
tree | a51d68a0d2fc5470b307d34800823f1ab87259dd | |
parent | 245e7912bf31c7d55541f1be45b3cffc11d7f3b3 (diff) | |
parent | 4483bb9cdc1031a85a3a1fc1ea186a7390c807ba (diff) | |
download | ansible-clever-e1ffebc7abc311393dfca85495a5c90ffe6dad04.tar.gz ansible-clever-e1ffebc7abc311393dfca85495a5c90ffe6dad04.tar.zst ansible-clever-e1ffebc7abc311393dfca85495a5c90ffe6dad04.zip |
Merge pull request #27 from paulrbr-fl/chdir-all-the-things
fix(deploy): Yet again a missing chdir to execute from app root
-rwxr-xr-x | files/clever-wait-deploy.sh | 6 | ||||
-rw-r--r-- | tasks/deploy.yml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/files/clever-wait-deploy.sh b/files/clever-wait-deploy.sh index e0bbcf1..b911069 100755 --- a/files/clever-wait-deploy.sh +++ b/files/clever-wait-deploy.sh | |||
@@ -48,9 +48,7 @@ function check { | |||
48 | } | 48 | } |
49 | 49 | ||
50 | function getHeadRev { | 50 | function getHeadRev { |
51 | local chdir="$1/.git" | 51 | git rev-parse HEAD |
52 | |||
53 | git --git-dir="$chdir" rev-parse HEAD | ||
54 | } | 52 | } |
55 | 53 | ||
56 | check "$(getHeadRev "$@")" | 54 | check "$(getHeadRev)" |
diff --git a/tasks/deploy.yml b/tasks/deploy.yml index 3bd74ee..ae7e5f6 100644 --- a/tasks/deploy.yml +++ b/tasks/deploy.yml | |||
@@ -58,7 +58,9 @@ | |||
58 | - skip_ansible_lint | 58 | - skip_ansible_lint |
59 | 59 | ||
60 | - name: Watch deployment status | 60 | - name: Watch deployment status |
61 | command: "clever-wait-deploy.sh '{{ clever_app_root }}'" | 61 | command: "clever-wait-deploy.sh" |
62 | args: | ||
63 | chdir: "{{ clever_app_root }}" | ||
62 | async: 900 | 64 | async: 900 |
63 | poll: 0 | 65 | poll: 0 |
64 | register: long_command | 66 | register: long_command |