From bf51b42128df399a5ff6dbd9057a12d39537040f Mon Sep 17 00:00:00 2001
From: Michael Aaron Murphy <mmstickman@gmail.com>
Date: Sun, 22 Jul 2018 22:03:19 -0600
Subject: [PATCH] Speed up ion CI builds
---
.gitlab-ci.yml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9574ec20..92893693 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,10 @@
+image: 'rust:latest'
+
+variables:
+ CARGO_HOME: $CI_PROJECT_DIR/cargo
before_script:
- apt-get update -qq
- apt-get install -qq build-essential curl git
- - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain stable
- - source "$HOME/.cargo/env"
linux:
script:
@@ -10,22 +12,23 @@ linux:
- make tests
cache:
paths:
- - target
+ - cargo/
+ - target/
redox:
variables:
CC: "x86_64-unknown-redox-gcc"
before_script:
- apt-get update -qq
- - apt-get install -qq build-essential curl git gnupg software-properties-common
+ - apt-get install -qq build-essential curl git gnupg software-properties-common apt-transport-https
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
- add-apt-repository 'deb https://static.redox-os.org/toolchain/apt /'
- apt-get update -qq && apt-get install -qq x86-64-unknown-redox-gcc
- - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly-2018-07-18
- - source "$HOME/.cargo/env"
+ - rustup default nightly-2018-07-18
- rustup target add x86_64-unknown-redox
script:
- cargo build --target x86_64-unknown-redox
cache:
paths:
- - target
+ - cargo/
+ - target/
--
GitLab