From f6ed4060efdf2b53a787fcd9a70003d57a197f45 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 10 Apr 2020 16:37:05 -0400 Subject: [PATCH] Revert "Update gitlab-ci to use a version of sccache that supports CUDA" This reverts commit 5b469b75a191874abeb8c5cc694fcfba5f0b90c9. --- .gitlab-ci.yml | 2 +- .gitlab/ci/config/sccache.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b067091d..79c5f8940 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,7 +101,7 @@ stages: before_script: - .gitlab/ci/config/sccache.sh - export PATH=$PWD/.gitlab:$PATH - - SCCACHE_IDLE_TIMEOUT=0 sccache --start-server + - SCCACHE_IDLE_TIMEOUT=1200 sccache --start-server - sccache --show-stats - "cmake --version" - "cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake" diff --git a/.gitlab/ci/config/sccache.sh b/.gitlab/ci/config/sccache.sh index 60e322f8c..c88cdcc5e 100755 --- a/.gitlab/ci/config/sccache.sh +++ b/.gitlab/ci/config/sccache.sh @@ -2,15 +2,15 @@ set -e -readonly version="nvcc_v2" -readonly sha256sum="923e919ffdf3a9d7bdee79ddaea0169fc1f41dd2f2cac2c0b160b7a21d9c459d" -readonly filename="sccache-0.2.14-$version-x86_64-unknown-linux-musl" +readonly version="0.2.12" +readonly sha256sum="26fd04c1273952cc2a0f359a71c8a1857137f0ee3634058b3f4a63b69fc8eb7f" +readonly filename="sccache-$version-x86_64-unknown-linux-musl" readonly tarball="$filename.tar.gz" cd .gitlab echo "$sha256sum $tarball" > sccache.sha256sum -curl -OL "https://github.com/robertmaynard/sccache/releases/download/$version/$tarball" +curl -OL "https://github.com/mozilla/sccache/releases/download/$version/$tarball" sha256sum --check sccache.sha256sum tar xf "$tarball" -#mv "$filename/sccache" . +mv "$filename/sccache" .