diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d88e4c27109..d3f8b0047b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,6 @@ workflow: - cargo +nightly --version - cargo spellcheck --version - bash --version - - sccache -s .test-refs: &test-refs rules: @@ -76,11 +75,9 @@ workflow: image: "${CI_IMAGE}" before_script: - *rust-info-script - - ./scripts/ci/pre_cache.sh - - sccache -s interruptible: true tags: - - linux-docker + - linux-docker-vm-c2 .kubernetes-env: &kubernetes-env interruptible: true diff --git a/scripts/ci/pre_cache.sh b/scripts/ci/pre_cache.sh deleted file mode 100755 index c25d73587bf..00000000000 --- a/scripts/ci/pre_cache.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -u - -# if there is no directory for this $CI_COMMIT_REF_NAME/$CI_JOB_NAME -# create such directory and -# copy recursively all the files from the newest dir which has $CI_JOB_NAME, if it exists - -# cache lives in /ci-cache/${CI_PROJECT_NAME}/${2}/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME} - -function prepopulate { - if [[ ! -d $1 ]]; then - mkdir -p "/ci-cache/$CI_PROJECT_NAME/$2/$CI_COMMIT_REF_NAME"; - FRESH_CACHE=$(find "/ci-cache/$CI_PROJECT_NAME/$2" -mindepth 2 -maxdepth 2 \ - -type d -name "$CI_JOB_NAME" -exec stat --printf="%Y\t%n\n" {} \; |sort -n -r |head -1 |cut -f2); - if [[ -d $FRESH_CACHE ]]; then - echo "____Using" "$FRESH_CACHE" "to prepopulate the cache____"; - time cp -r "$FRESH_CACHE" "$1"; - else - echo "_____No such $2 dir, proceeding from scratch_____"; - fi - else - echo "____No need to prepopulate $2 cache____"; - fi -} - -# CARGO_HOME cache is still broken so would be handled some other way. -prepopulate "$CARGO_TARGET_DIR" targets