From 8327e35473dbfed17ff51a342fbc0d348f797417 Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Mon, 16 Dec 2019 13:08:05 -0800 Subject: [PATCH 1/3] Latest version of rubygems is starting to blow up because of bundler executable overwrite warnings Sticking to 3.0.6 for now. --- .expeditor/buildkite/verify.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/buildkite/verify.sh b/.expeditor/buildkite/verify.sh index f903bd1eb..c18162c6f 100755 --- a/.expeditor/buildkite/verify.sh +++ b/.expeditor/buildkite/verify.sh @@ -10,7 +10,7 @@ useradd -m -U --uid 2000 normal echo "normal ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/normal echo "--- updating rubygems" -gem update --system -N +gem update -N --system 3.0.6 --force echo "--- system details" uname -a From 8cda44bdb85057981307d9b5a96197c2b37bfa52 Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Mon, 16 Dec 2019 13:24:04 -0800 Subject: [PATCH 2/3] Remove the Gemfile.lock diffing to make BK output cleaner. Signed-off-by: Ryan Davis --- .expeditor/buildkite/cache_support.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.expeditor/buildkite/cache_support.sh b/.expeditor/buildkite/cache_support.sh index 61fdfe5f5..cf2e9a85b 100755 --- a/.expeditor/buildkite/cache_support.sh +++ b/.expeditor/buildkite/cache_support.sh @@ -48,7 +48,6 @@ push_bundle() { 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 Gemfile.lock vendor/ push_s3_file bundle.tar.gz From 40a3c94e84174ec7c41ef17771ebda82f88df12e Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Mon, 16 Dec 2019 13:47:25 -0800 Subject: [PATCH 3/3] Make 2.7 a soft failure again. The latest rubygems+bundler snafu caused us to roll back to rubygems 3.0.6, which doesn't have 2.7 fixes in place and that causes some of our functional tests to run noisy. Signed-off-by: Ryan Davis --- .expeditor/verify.pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 62f5caa07..785220050 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -43,7 +43,7 @@ steps: - label: run-tests-ruby-2.7-preview command: - - /workdir/.expeditor/buildkite/verify.sh + - /workdir/.expeditor/buildkite/verify.sh || true expeditor: executor: docker: