From c5dca69dcbc4b9ff7d9895f20fe789ad87e8bbeb Mon Sep 17 00:00:00 2001 From: Jonas Fowl Date: Wed, 12 May 2021 19:43:41 +0000 Subject: [PATCH 1/4] Try to improve CI build times by caching --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d09a881..dfece58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,10 @@ image: "rust:latest" +cache: + paths: + - target + + variables: GIT_SUBMODULE_STRATEGY: recursive From 6db046fc20a2932219551542d8a85eb5da8699c6 Mon Sep 17 00:00:00 2001 From: Jonas Fowl Date: Wed, 12 May 2021 19:50:48 +0000 Subject: [PATCH 2/4] Also try to cache $CARGO_HOME --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfece58..4d21b68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,12 +3,15 @@ image: "rust:latest" cache: paths: - target + - cargohome variables: GIT_SUBMODULE_STRATEGY: recursive + CARGO_HOME: "CI_PROJECT_DIR/cargohome" before_script: + - mkdir -p $CARGO_HOME && echo "using $CARGO_HOME to cache cargo deps" - apt-get update -yqq - apt-get install -yqq --no-install-recommends build-essential libssl-dev pkg-config - rustup component add clippy rustfmt From ce5958363aa543e4017a5b1e63d316421f0f3467 Mon Sep 17 00:00:00 2001 From: Jonas Fowl Date: Wed, 12 May 2021 19:57:55 +0000 Subject: [PATCH 3/4] Remove wrong and unnecesary CI_PROJECT_DIR, which cargo apparently does not need --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d21b68..a38a427 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ cache: variables: GIT_SUBMODULE_STRATEGY: recursive - CARGO_HOME: "CI_PROJECT_DIR/cargohome" + CARGO_HOME: "cargohome" before_script: - mkdir -p $CARGO_HOME && echo "using $CARGO_HOME to cache cargo deps" From 6c4b82a3219dde8213c20c58f64701317704a564 Mon Sep 17 00:00:00 2001 From: Jonas Fowl Date: Wed, 12 May 2021 20:31:21 +0000 Subject: [PATCH 4/4] Tell gitlab ci to zip caches faster (thanks @deepbluev7:neko.dev) --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a38a427..b3dcd5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ cache: variables: GIT_SUBMODULE_STRATEGY: recursive CARGO_HOME: "cargohome" + FF_USE_FASTZIP: 1 before_script: - mkdir -p $CARGO_HOME && echo "using $CARGO_HOME to cache cargo deps"