From c47b6b55335a01be4a8dbbfb42a276e5222b3908 Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Mon, 29 Jun 2020 17:52:26 +0200 Subject: fix: prevent crash when the deployment times out --- tasks/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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") -- cgit v1.2.3 From ff807544492f1503ccac99ad6d472057f3d325a7 Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Mon, 29 Jun 2020 18:29:25 +0200 Subject: ci: trying to fix nix-channel by removing unstable channel NIX_PATH used to be enough to select the channel to use, but as Travis add the nixpkgs-unstable channel we can get unexpected results when nix decides to push a new unstable version out there in the public. --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3