From a5767ff5ec84fb9fe4e1b5b30acb5f9992f2ed43 Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <xavier.lheureux@icloud.com>
Date: Mon, 22 Jul 2019 16:09:36 -0400
Subject: [PATCH] ci: Separate caches + don't use local nix
---
.gitlab-ci.yml | 17 ++++++++++++-----
Cargo.toml | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88766145..38a9660c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,12 +5,11 @@ variables:
before_script:
- apt-get update -qq
- apt-get install -qq build-essential curl git
-cache:
- paths:
- - cargo/
- - target/
-
format:
+ cache:
+ paths:
+ - cargo/
+ - target/
script:
- rustup default nightly
- rustup component add rustfmt
@@ -18,11 +17,19 @@ format:
linux:
image: 'rust:1.35.0'
+ cache:
+ paths:
+ - cargo/
+ - target/
script:
- cargo check
- FULL=1 make tests
linux:stable:
+ cache:
+ paths:
+ - cargo/
+ - target/
script:
- cargo check
- TOOLCHAIN= make tests
diff --git a/Cargo.toml b/Cargo.toml
index bf174a38..329879ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -88,7 +88,7 @@ structopt = "^0.2"
atty = "0.2"
permutate = "0.3"
xdg = "2.1"
-nix = { path = "../nix" }
+nix = "0.14"
[target."cfg(all(unix, not(target_os = \"redox\")))".dependencies]
users = "0.9"
--
GitLab