diff options
author | paulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com> | 2018-11-05 14:28:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-05 14:28:02 +0100 |
commit | 729e0bcf8bf2cfb9105af0e91edb0dc8535cc3f0 (patch) | |
tree | 518064a1decf740a0894b6702c5a6b076ab80d9e | |
parent | 4ea7d2664061e806ca99b66af4b97f6e9d68f846 (diff) | |
parent | f2c39e5b3ee29fc50954a47fd4df35e7ad66d657 (diff) | |
download | ansible-clever-1.7.tar.gz ansible-clever-1.7.tar.zst ansible-clever-1.7.zip |
Merge pull request #16 from paulrbr-fl/fix-clever-app-root-for-goodv1.7
fix: 😬 really fix the usage of "clever_app_root" when waiting deploy
-rwxr-xr-x[-rw-r--r--] | files/clever-wait-deploy.sh | 8 | ||||
-rw-r--r-- | tasks/deploy.yml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/files/clever-wait-deploy.sh b/files/clever-wait-deploy.sh index c955f6a..e0bbcf1 100644..100755 --- a/files/clever-wait-deploy.sh +++ b/files/clever-wait-deploy.sh | |||
@@ -47,4 +47,10 @@ function check { | |||
47 | deployed "$commit" | 47 | deployed "$commit" |
48 | } | 48 | } |
49 | 49 | ||
50 | check "$(git rev-parse HEAD)" | 50 | function getHeadRev { |
51 | local chdir="$1/.git" | ||
52 | |||
53 | git --git-dir="$chdir" rev-parse HEAD | ||
54 | } | ||
55 | |||
56 | check "$(getHeadRev "$@")" | ||
diff --git a/tasks/deploy.yml b/tasks/deploy.yml index ca8bf15..84ebe73 100644 --- a/tasks/deploy.yml +++ b/tasks/deploy.yml | |||
@@ -52,7 +52,7 @@ | |||
52 | - skip_ansible_lint | 52 | - skip_ansible_lint |
53 | 53 | ||
54 | - name: Watch deployment status | 54 | - name: Watch deployment status |
55 | command: clever-wait-deploy.sh | 55 | command: "clever-wait-deploy.sh '{{ clever_app_root }}'" |
56 | async: 900 | 56 | async: 900 |
57 | poll: 0 | 57 | poll: 0 |
58 | register: long_command | 58 | register: long_command |