From ea64443370f1620410f664b9d002ecb52cd737d3 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 7 Apr 2021 14:30:46 -0700 Subject: [PATCH] Cache builds in Buildkite Signed-off-by: Tim Smith --- .expeditor/run_linux_tests.sh | 40 +--------------------------------- .expeditor/verify.pipeline.yml | 3 +++ 2 files changed, 4 insertions(+), 39 deletions(-) diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh index 4c14c80..fc2f6b2 100755 --- a/.expeditor/run_linux_tests.sh +++ b/.expeditor/run_linux_tests.sh @@ -5,49 +5,11 @@ set -ue export USER="root" - -echo "--- dependencies" export LANG=C.UTF-8 LANGUAGE=C.UTF-8 -S3_URL="s3://public-cd-buildkite-cache/${BUILDKITE_PIPELINE_SLUG}/${BUILDKITE_LABEL}" - -pull_s3_file() { - aws s3 cp "${S3_URL}/$1" "$1" || echo "Could not pull $1 from S3" -} - -push_s3_file() { - if [ -f "$1" ]; then - aws s3 cp "$1" "${S3_URL}/$1" || echo "Could not push $1 to S3 for caching." - fi -} - -apt-get update -y -apt-get install awscli -y echo "--- bundle install" -pull_s3_file "bundle.tar.gz" -pull_s3_file "bundle.sha256" - -if [ -f bundle.tar.gz ]; then - tar -xzf bundle.tar.gz -fi - -if [ -n "${RESET_BUNDLE_CACHE:-}" ]; then - rm bundle.sha256 -fi - bundle config --local path vendor/bundle bundle install --jobs=7 --retry=3 -echo "--- bundle cache" -if test -f bundle.sha256 && shasum --check bundle.sha256 --status; then - echo "Bundled gems have not changed. Skipping upload to s3" -else - echo "Bundled gems have changed. Uploading to s3" - shasum -a 256 Gemfile.lock > bundle.sha256 - tar -czf bundle.tar.gz vendor/ - push_s3_file bundle.tar.gz - push_s3_file bundle.sha256 -fi - echo "+++ bundle exec task" -bundle exec $1 +bundle exec $@ diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 88a780a..07a63ed 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,5 +1,7 @@ --- expeditor: + cached_folders: + - vendor defaults: buildkite: timeout_in_minutes: 30 @@ -48,6 +50,7 @@ steps: - label: run-specs-windows command: + - bundle config --local path vendor/bundle - bundle install --jobs=7 --retry=3 --without docs debug - bundle exec rake expeditor: