From 14e835e4cc870c48509c6981d952eac122b0e960 Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Tue, 3 Dec 2019 15:04:52 -0800 Subject: [PATCH] Attempt to fix bundle caching. Unfortunately, I can only test this via commits to BK... Signed-off-by: Ryan Davis --- .expeditor/buildkite/verify.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.expeditor/buildkite/verify.sh b/.expeditor/buildkite/verify.sh index e4af5901e..a02cb66ca 100755 --- a/.expeditor/buildkite/verify.sh +++ b/.expeditor/buildkite/verify.sh @@ -42,6 +42,7 @@ if [ -z "${SKIP_BUNDLE_CACHE:-}" ]; then if [ -f bundle.tar.gz ]; then tar -xzf bundle.tar.gz + mv Gemfile.lock Gemfile.lock.old || true fi if [ -n "${RESET_BUNDLE_CACHE:-}" ]; then @@ -58,8 +59,9 @@ if [ -z "${SKIP_BUNDLE_CACHE:-}" ]; then echo "Bundled gems have not changed. Skipping upload to s3" else echo "Bundled gems have changed. Uploading to s3" + diff -u Gemfile.lock.old Gemfile.lock || true shasum -a 256 Gemfile.lock > bundle.sha256 - tar -czf bundle.tar.gz vendor/ + tar -czf bundle.tar.gz Gemfile.lock vendor/ push_s3_file bundle.tar.gz push_s3_file bundle.sha256 fi