Merge pull request #1356 from segmentio/eculver/upgrade-cache-plugin

TOOL-1461 - Misc CI improvements

Author: markzegarelli

.buildkite/pipeline.yml

@@ -1,4 +1,23 @@
 steps:
+  - label: ":hammer: Install Dependencies"
+    command:
+      - make deps
+    env:
+      SEGMENT_CONTEXTS: "snyk, aws-credentials"
+    plugins:
+      - docker#v3.3.0:
+          image: jekyll/jekyll:4.2.0
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-gem-{{ checksum 'Gemfile.lock' }}"
+          paths: [ "vendor/" ]
+          save: true
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-npm-{{ checksum 'yarn.lock' }}"
+          paths: [ "node_modules/" ]
+          save: true
+
+  - wait: ~
+
   - label: ":hammer: Build Dependencies and Docs"
     command:
       - make test
@@ -10,18 +29,17 @@ steps:
         - build_package.tar.gz
     plugins:
       - docker#v3.3.0:
-          image: jekyll/jekyll
+          image: jekyll/jekyll:4.2.0
           environment:
             - BUILDKITE_BRANCH
-
-      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v1.0.0:
-          key: "v1-cache-gem-{{ checksum 'Gemfile.lock' }}"
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-gem-{{ checksum 'Gemfile.lock' }}"
           paths: [ "vendor/" ]
-      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v1.0.0:
-          key: "v1-cache-npm-{{ checksum 'yarn.lock' }}"
+      - ssh://[email protected]/segmentio/cache-buildkite-plugin#v3.0.0:
+          key: "v2-cache-npm-{{ checksum 'yarn.lock' }}"
           paths: [ "node_modules/" ]
-     
-  - wait
+
+  - wait: ~
 
   - label: ":shipit: Deploy Docs to S3"
     env:
@@ -30,4 +48,4 @@ steps:
     command:
       - buildkite-agent artifact download build_package.tar.gz .
       - make unzip-artifacts
-      - make upload-docs
+      - make upload-docs

Gemfile.lock

@@ -97,6 +97,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86_64-linux-musl
 
 DEPENDENCIES
   dotenv
@@ -115,4 +116,4 @@ DEPENDENCIES
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.2

Makefile

@@ -101,8 +101,9 @@ node_modules: package.json yarn.lock
 vendor/bundle:
 	@export BUNDLE_PATH="vendor/bundle"
 	@mkdir -p vendor && mkdir -p vendor/bundle
-	@chmod -R 777 vendor/
-	@bundle install --path=vendor/bundle
+	@chmod -R 777 vendor/ Gemfile.lock
+	@bundle config set --local path 'vendor/bundle'
+	@bundle install
 
 
 .PHONY: lint