From 5075165f7b5706af1da567a53bc8e4be54c08f64 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 20 Mar 2020 17:15:03 +0100
Subject: ci: Avoid concurrent build jobs from clobbering their state.

---
 .gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06e7b1bd..f56f2426 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,9 @@ buster:
     - make codespell CODESPELL_FLAGS=--summary
     - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind cargo test -p buffered-reader -p sequoia-openpgp -p sequoia-sqv -p sequoia-openpgp-ffi
 
+  variables:
+    CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.buster
+
 bullseye:
   tags:
     - self-hosted
@@ -35,7 +38,7 @@ bullseye:
     - if ! git diff --quiet ; then echo "Please run 'make -C sqv update-usage' and commit the result." ; false ; fi
 
   variables:
-    CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target-bullseye
+    CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.bullseye
     RUSTFLAGS: -D warnings -A unused-parens
 
 rust-stable:
@@ -57,13 +60,12 @@ rust-stable:
     - cargo test -p buffered-reader -p sequoia-openpgp -p sequoia-sqv
 
   variables:
-    CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target-rust-stable
+    CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.rust-stable
     RUSTFLAGS: -D warnings -A unused-parens
 
 variables:
   DEBIAN_FRONTEND: noninteractive
   CARGO_HOME: $CI_PROJECT_DIR/../cargo
-  CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target
   CARGO_FLAGS: --color always
   CARGO_INCREMENTAL: 0
   RUST_BACKTRACE: full
-- 
cgit v1.2.3