2 files changed, 7 insertions, 2 deletions

diff --git a/.travis.yml b/.travis.yml
index 7ce4540..4a7aa46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,12 @@ sudo: false
 language: nix
 nix: 2.3.4
 env:
-  - NIX_PATH=nixpkgs=channel:nixos-20.03
+  - CUSTOM_NIX_PATH=nixpkgs=channel:nixos-20.03
+
+# Travis nix integration will install nix AFTER the environment variables are set
+# and the nix installer will overide NIX_PATH variable thus we need to re-export it
+before_install:
+  - export NIX_PATH="$CUSTOM_NIX_PATH"
 
 install:
   - nix-env -i -f ./default.nix
diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index c567981..f9d8408 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -75,7 +75,7 @@
 - name: Retry deploy to clever-cloud
   include_tasks: redeploy.yml
   when:
-    - not job_result.rc == 0
+    - not job_result.finished or not job_result.rc == 0
     - job_result.stderr is defined
     - job_result.stderr is search("Failed to read git object")