Merge pull request #113 from chef/IPACK-95-chef-ffi-libarchive-operationalize-ruby-3-0-3-1-verify-pipelineHEADmain

add ruby 3.1 in verfiy pipeline

6 files changed, 116 insertions, 51 deletions

diff --git a/.expeditor/buildkite/run_linux_tests.sh b/.expeditor/buildkite/run_linux_tests.sh
new file mode 100755
index 0000000..3774734
--- /dev/null
+++ b/.expeditor/buildkite/run_linux_tests.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+
+set -evx
+
+echo "---Bundle install---"
+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
+
+echo "---Bundle Exec---"
+bundle exec rake
\ No newline at end of file
diff --git a/.expeditor/buildkite/run_windows_tests.ps1 b/.expeditor/buildkite/run_windows_tests.ps1
new file mode 100644
index 0000000..ed5c28a
--- /dev/null
+++ b/.expeditor/buildkite/run_windows_tests.ps1
@@ -0,0 +1,42 @@
+param([String]$version)
+# This script will run ruby test on windows platform. It requires a version
+# "3.0" or "3.1" as an argument.
+
+# Stop script execution when a non-terminating error occurs. Note that this makes it
+# unneccesary to check the exit code of each program being run - non-zero exit will force it to fail and terminate.
+$ErrorActionPreference = "Stop"
+
+# The specific paths of tools within the ruby30/31 devkit vary a bit across 3.0 and 3.1
+if ($version -eq "3.0")
+{
+    $base_dir = "C:\ruby30\"
+    $Env:PATH += ";" + $base_dir + "ruby\bin;" + $base_dir + "msys64\usr\bin;" + $base_dir + "msys64\mingw64\bin"
+}
+elseif($version -eq "3.1")
+{
+    $base_dir = "C:\ruby31\"
+    # Note path change - gcc is living in ucrt64\bin here, and mingw64 in earlier versions.
+    $Env:PATH += ";" + $base_dir + "ruby\bin;" + $base_dir + "msys64\usr\bin;" + $base_dir + "msys64\ucrt64\bin"
+}
+
+Write-Output "--- Ensuring required bins are in path"
+Write-Output  "PATH: " + $Env:PATH
+make --version
+gcc --version
+ruby --version
+bundler --version
+
+Write-Output "--- Updating system gems"
+gem update --system
+
+Write-Output "--- Bundle install"
+bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
+
+Write-Output "--- Gem install"
+gem install yajl-ruby json psych
+
+Write-Output "--- Bundle Execute: rake compile"
+bundle exec rake compile
+
+Write-Output "--- Bundle Execute: rake spec"
+bundle exec rake spec
diff --git a/.expeditor/buildkite/verify.ps1 b/.expeditor/buildkite/verify.ps1
index 106e1bf..c72188b 100644
--- a/.expeditor/buildkite/verify.ps1
+++ b/.expeditor/buildkite/verify.ps1
@@ -2,37 +2,37 @@ echo "--- system details"
 $Properties = 'Caption', 'CSName', 'Version', 'BuildType', 'OSArchitecture'
 Get-CimInstance Win32_OperatingSystem | Select-Object $Properties | Format-Table -AutoSize
 
-echo "--- Install make and ruby2.devkit"
-choco install make ruby ruby2.devkit -y
+echo "--- Install make"
+choco install make -y
 refreshenv
-
-echo - c:\tools\ruby26 > c:\tools\Devkit2\config.yml
-ruby c:\tools\Devkit2\dk.rb install
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 choco install msys2 -y
 refreshenv
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 Write-Output 'Updating PATH'
 $env:PATH = "C:\tools\ruby26\bin;C:\tools\DevKit2\mingw\bin;C:\tools\DevKit2\bin;" + $env:PATH
 [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 ruby -v
 bundle --version
 gem -v
-
-C:\tools\ruby26\ridk_use\ridk.cmd install 3
-C:\tools\ruby26\ridk_use\ridk.cmd  enable
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "--- gem install bundler"
 gem install bundler
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "--- bundle install"
 bundle install --without development_extras --jobs 3 --retry 3 --path vendor/bundle
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "+++ bundle exec rake compile"
 bundle exec rake compile
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo "+++ bundle exec rake spec"
 bundle exec rake spec
-
-exit $LASTEXITCODE
\ No newline at end of file
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
\ No newline at end of file
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"
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 950afb7..0a26873 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,5 @@
 # Order is important. The last matching pattern has the most precedence.
 
-*                 @chef/chef-foundation-owners @chef/chef-foundation-approvers @chef/chef-foundation-reviewers
-.expeditor/       @chef/jex-team
+*                 @chef/chef-infra-owners @chef/chef-infra-approvers @chef/chef-infra-reviewers
+.expeditor/       @chef/infra-packages
 *.md              @chef/docs-team
diff --git a/Gemfile b/Gemfile
index 30fe201..6859635 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,13 +6,19 @@ group :development do
   # for testing loading concurrently with yajl-ruby, not on jruby
   # gem 'yajl-ruby', platforms: [ :ruby, :mswin, :mingw ]
   gem "ffi"
-  gem "rake", ">= 10.1"
-  gem "rspec", "~> 3.0"
+  gem "rake"#, ">= 10.1"
+  gem "rspec"#, "~> 3.0"
   gem "pry", "~> 0.9"
-  gem "rake-compiler", "~> 1.0"
-  gem "rack", "~> 2.0"
+  gem "rake-compiler"#, "~> 1.0"
+  gem "rack"#, "~> 2.0"
 end
 
 group :development_extras do
   gem "chefstyle"
 end
+
+instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
+
+# If you want to load debugging tools into the bundle exec sandbox,
+# add these additional dependencies into Gemfile.local
+eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")
\ No newline at end of file