Skip to content
Snippets Groups Projects
Commit a5767ff5 authored by AdminXVII's avatar AdminXVII Committed by Michael Aaron Murphy
Browse files

ci: Separate caches + don't use local nix

parent 10321fae
No related branches found
No related tags found
No related merge requests found
...@@ -5,12 +5,11 @@ variables: ...@@ -5,12 +5,11 @@ variables:
before_script: before_script:
- apt-get update -qq - apt-get update -qq
- apt-get install -qq build-essential curl git - apt-get install -qq build-essential curl git
cache:
paths:
- cargo/
- target/
format: format:
cache:
paths:
- cargo/
- target/
script: script:
- rustup default nightly - rustup default nightly
- rustup component add rustfmt - rustup component add rustfmt
...@@ -18,11 +17,19 @@ format: ...@@ -18,11 +17,19 @@ format:
linux: linux:
image: 'rust:1.35.0' image: 'rust:1.35.0'
cache:
paths:
- cargo/
- target/
script: script:
- cargo check - cargo check
- FULL=1 make tests - FULL=1 make tests
linux:stable: linux:stable:
cache:
paths:
- cargo/
- target/
script: script:
- cargo check - cargo check
- TOOLCHAIN= make tests - TOOLCHAIN= make tests
......
...@@ -88,7 +88,7 @@ structopt = "^0.2" ...@@ -88,7 +88,7 @@ structopt = "^0.2"
atty = "0.2" atty = "0.2"
permutate = "0.3" permutate = "0.3"
xdg = "2.1" xdg = "2.1"
nix = { path = "../nix" } nix = "0.14"
[target."cfg(all(unix, not(target_os = \"redox\")))".dependencies] [target."cfg(all(unix, not(target_os = \"redox\")))".dependencies]
users = "0.9" users = "0.9"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment