aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml7
-rw-r--r--tasks/deploy.yml2
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
3language: nix 3language: nix
4nix: 2.3.4 4nix: 2.3.4
5env: 5env:
6 - NIX_PATH=nixpkgs=channel:nixos-20.03 6 - CUSTOM_NIX_PATH=nixpkgs=channel:nixos-20.03
7
8# Travis nix integration will install nix AFTER the environment variables are set
9# and the nix installer will overide NIX_PATH variable thus we need to re-export it
10before_install:
11 - export NIX_PATH="$CUSTOM_NIX_PATH"
7 12
8install: 13install:
9 - nix-env -i -f ./default.nix 14 - 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 @@
75- name: Retry deploy to clever-cloud 75- name: Retry deploy to clever-cloud
76 include_tasks: redeploy.yml 76 include_tasks: redeploy.yml
77 when: 77 when:
78 - not job_result.rc == 0 78 - not job_result.finished or not job_result.rc == 0
79 - job_result.stderr is defined 79 - job_result.stderr is defined
80 - job_result.stderr is search("Failed to read git object") 80 - job_result.stderr is search("Failed to read git object")
81 81