From 87e09a420860ef9f708b7501ff29ab1223154ce3 Mon Sep 17 00:00:00 2001
From: Jaymala Sinha <jsinha@chef.io>
Date: Mon, 14 Oct 2019 10:09:26 -0400
Subject: Remove appveyor integration and fix ruby-2.4 env

Signed-off-by: Jaymala Sinha <jsinha@chef.io>
---
 .expeditor/verify.pipeline.yml |  9 +++++----
 appveyor.yml                   | 34 ----------------------------------
 2 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 appveyor.yml

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 0e08819..1445e83 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,13 +1,13 @@
 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 development --jobs 3 --retry 3 --path vendor/bundle
-    - gem install ffi json psych
-    - export FORCE_FFI_YAJL="ffi"
+    - gem install yajl-ruby json psych
     - bundle exec rake
   soft_fail:
       - exit_status: 1
@@ -17,7 +17,7 @@ steps:
         image: ruby:2.4
         environment:
           - BUNDLE_GEMFILE=/workdir/Gemfile
-          - FORCE_FFI_YAJL="ffi"
+          - FORCE_FFI_YAJL="ext"
 
 - label: ":ruby: 2.5"
   command:
@@ -52,6 +52,7 @@ steps:
           - 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
   command:
     - ruby --version
@@ -73,7 +74,7 @@ steps:
           - RUBY_PLATFORM="jruby"
           - FORCE_FFI_YAJL="ffi"
 
-- label: run-specs-windows
+- label: "run specs :windows:"
   command:
     - /workdir/.expeditor/buildkite/verify.ps1
   timeout_in_minutes: 20
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index acaceed..0000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: "master-{build}"
-
-os: Windows Server 2012 R2
-platform:
-  - x64
-
-environment:
-  matrix:
-    - RUBY_VERSION: "23"
-
-clone_folder: c:\projects\ffi-yajl
-clone_depth: 1
-skip_tags: true
-branches:
-  only:
-    - master
-
-install:
-  - SET PATH=C:\Ruby%RUBY_VERSION%\bin;C:\Ruby23\DevKit\mingw\bin;C:\Ruby23\DevKit\bin;%PATH%
-  - echo %PATH%
-  - ruby --version
-  - gem update --system || gem update --system || gem update --system
-  - gem --version
-  - bundler --version
-
-build_script:
-  - bundle install || bundle install || bundle install
-
-test_script:
-  # compile needs to have the devkit loaded up
-  # - C:\Ruby21\DevKit\devkitvars.bat
-  - echo %PATH%
-  - bundle exec rake compile
-  - bundle exec rake spec
-- 
cgit v1.2.1