From bd8840a917ce0003e68b8d640c0ba34ac892f2ed Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 3 Oct 2022 19:59:52 +1100 Subject: [PATCH 1/2] Use Ruby version 2.7.4 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 2714f5313..a4dd9dba4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.6.4 +2.7.4 From 40afa553e5d641410ae113c7ea01a4d1a7e46292 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Mon, 3 Oct 2022 20:00:33 +1100 Subject: [PATCH 2/2] Use `bash-cache` Buildkite plugin version 2.8.0 This version includes a fix that removes the need to run `gem install bundler` before each step. --- .buildkite/pipeline.yml | 11 +---------- .buildkite/publish-aztec-pod.sh | 3 --- .buildkite/publish-editor.pod.sh | 3 --- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index bc33a6bc9..2934c4927 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ # Nodes with values to reuse in the pipeline. common_params: plugins: &common_plugins - - &bash_cache automattic/bash-cache#2.0.0: ~ + - &bash_cache automattic/bash-cache#2.8.0 # Common environment values to use with the `env` key. env: &common_env IMAGE_ID: xcode-13 @@ -14,9 +14,6 @@ steps: - label: "🧪 Build and Test" key: "test" command: | - # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 - gem install bundler:2.3.4 - build_and_test_pod env: *common_env plugins: *common_plugins @@ -27,9 +24,6 @@ steps: - label: "🔬 Validate Podspecs" key: "validate" command: | - # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 - gem install bundler:2.3.4 - validate_podspec env: *common_env plugins: *common_plugins @@ -40,9 +34,6 @@ steps: - label: "🧹 Lint" key: "lint" command: | - # See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 - gem install bundler:2.3.4 - lint_pod env: *common_env plugins: *common_plugins diff --git a/.buildkite/publish-aztec-pod.sh b/.buildkite/publish-aztec-pod.sh index 2343776da..a0beab3ba 100644 --- a/.buildkite/publish-aztec-pod.sh +++ b/.buildkite/publish-aztec-pod.sh @@ -5,9 +5,6 @@ SPECS_REPO="git@github.com:wordpress-mobile/cocoapods-specs.git" SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK echo "--- :rubygems: Setting up Gems" -# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 -gem install bundler:2.3.4 - install_gems echo "--- :cocoapods: Publishing Pod to CocoaPods CDN" diff --git a/.buildkite/publish-editor.pod.sh b/.buildkite/publish-editor.pod.sh index f6534c70f..68dbb507c 100644 --- a/.buildkite/publish-editor.pod.sh +++ b/.buildkite/publish-editor.pod.sh @@ -5,9 +5,6 @@ SPECS_REPO="git@github.com:wordpress-mobile/cocoapods-specs.git" SLACK_WEBHOOK=$PODS_SLACK_WEBHOOK echo "--- :rubygems: Setting up Gems" -# See https://github.com/Automattic/bash-cache-buildkite-plugin/issues/16 -gem install bundler:2.3.4 - install_gems echo "--- :cocoapods: Publishing Pod to CocoaPods CDN"