1 files changed, 38 insertions, 35 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 06ca2f3..10b5e42 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -3,12 +3,7 @@ steps:
 # Allow ruby-2.4 to softfail since it was configured so in travis too
 - label: ":ruby: 2.4"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install yajl-ruby json psych
-    - bundle exec rake
+    - .expeditor/buildkite/run_linux_tests.sh
   soft_fail:
       - exit_status: 1
   expeditor:
@@ -21,12 +16,7 @@ steps:
 
 - label: ":ruby: 2.5"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install yajl-ruby json psych
-    - bundle exec rake
+    - .expeditor/buildkite/run_linux_tests.sh
   expeditor:
     executor:
       docker:
@@ -37,49 +27,62 @@ steps:
 
 - label: ":ruby: 2.6"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install yajl-ruby json psych
-    - bundle exec rake
+    - .expeditor/buildkite/run_linux_tests.sh
   expeditor:
     executor:
       docker:
         image: ruby:2.6
-        privileged: true
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
           - FORCE_FFI_YAJL="ext"
 
-# Allow jruby to softfail since it was configured so in travis too
-- label: run-lint-and-specs-jruby
+- label: ":ruby: 3.0"
   command:
-    - ruby --version
-    - bundle --version
-    - gem update --system
-    - apt-get update -y && apt-get install -y git make gcc
-    - bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
-    - gem install ffi json psych
-    - bundle exec rake
-  soft_fail:
-      - exit_status: 1
+    - .expeditor/buildkite/run_linux_tests.sh
   expeditor:
     executor:
       docker:
-        image: jruby
+        image: ruby:3.0
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+          - FORCE_FFI_YAJL="ext"
+
+- label: ":ruby: 3.1"
+  command:
+    - .expeditor/buildkite/run_linux_tests.sh
+  expeditor:
+    executor:
+      docker:
+        image: ruby:3.1
         privileged: true
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
-          - RUBY_PLATFORM="jruby"
-          - FORCE_FFI_YAJL="ffi"
+          - FORCE_FFI_YAJL="ext"
+
+- label: ":windows: :ruby: 3.0"
+  command:
+    - .expeditor/buildkite/run_windows_tests.ps1 "3.0"
+  timeout_in_minutes: 20
+  expeditor:
+    executor:
+      docker:
+        host_os: windows
+        shell: ["powershell", "-Command"]
+        image: rubydistros/windows-2019:3.0
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+          - FORCE_FFI_YAJL="ext"
 
-- label: "run specs :windows:"
+- label: ":windows: :ruby: 3.1"
   command:
-    - /workdir/.expeditor/buildkite/verify.ps1
+    - .expeditor/buildkite/run_windows_tests.ps1 "3.1"
   timeout_in_minutes: 20
   expeditor:
     executor:
       docker:
         host_os: windows
         shell: ["powershell", "-Command"]
+        image: rubydistros/windows-2019:3.1
+        environment:
+          - BUNDLE_GEMFILE=/workdir/Gemfile
+          - FORCE_FFI_YAJL="ext"