Merge pull request #439 from rspec/update-ci-build-scripts-2020-11-18-for-main

Updates from rspec-dev (2020-11-18)

Author: JonRowe

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 name: RSpec CI
@@ -40,3 +40,27 @@ jobs:
       - run: script/clone_all_rspec_repos
       - run: bundle install --binstubs --standalone
       - run: script/run_build
+
+  windows:
+    name: Ruby ${{ matrix.ruby }} (Windows)
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby:
+          - 2.7
+          - 2.6
+          - 2.5
+          - 2.4
+          - 2.3
+          - 2.2
+          - 2.1.9
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler: 2
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: cinst ansicon
+      - run: bundle exec rspec --backtrace

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # In order to install old Rubies, we need to use old Ubuntu distibution.

Gemfile

@@ -49,8 +49,10 @@ if RUBY_VERSION < '2.2.0' && !!(RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|min
 elsif RUBY_VERSION < '2.0'
   # ffi dropped Ruby 1.8 support in 1.9.19 and Ruby 1.9 support in 1.11.0
   gem 'ffi', '< 1.9.19'
+elsif RUBY_VERSION < '2.3.0'
+  gem 'ffi', '~> 1.12.0'
 else
-  gem 'ffi', '~> 1.11.0'
+  gem 'ffi', '~> 1.13.0'
 end
 
 # No need to run rubocop on earlier versions

appveyor.yml

@@ -36,9 +36,9 @@
 
   c.example_status_persistence_file_path = "./spec/examples.txt"
 
-  c.define_derived_metadata :failing_on_appveyor do |meta|
-    meta[:pending] ||= "This spec fails on AppVeyor and needs someone to fix it."
-  end if ENV['APPVEYOR']
+  c.define_derived_metadata :failing_on_windows_ci do |meta|
+    meta[:pending] ||= "This spec fails on Windows CI and needs someone to fix it."
+  end if RSpec::Support::OS.windows? && ENV['CI']
 end
 
 module RSpec

lib/rspec/support/spec.rb

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from:

script/ci_functions.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/clone_all_rspec_repos

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {

script/predicate_functions.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-11-16T22:10:30+00:00 from the rspec-dev repo.
+# This file was generated on 2020-11-18T09:45:41+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/update_rubygems_and_install_bundler

@@ -155,7 +155,7 @@ def differ_ivars
             expect(diff).to be_diffed_as(expected_diff)
           end
 
-          it 'uses the default external encoding when the two strings have incompatible encodings', :failing_on_appveyor do
+          it 'uses the default external encoding when the two strings have incompatible encodings' do
             expected = "Tu avec carte {count} item has\n"
             actual   = "Tu avec carté {count} itém has\n".encode('UTF-16LE')
             expected_diff = "\n@@ #{one_line_header} @@\n-Tu avec carte {count} item has\n+Tu avec carté {count} itém has\n"
@@ -312,7 +312,7 @@ def inspect; "<BrokenObject>"; end
           end
         end
 
-        it 'outputs unified diff message of two hashes with differing encoding', :failing_on_appveyor do
+        it 'outputs unified diff message of two hashes with differing encoding' do
           expected_diff = dedent(<<-"EOD")
             |
             |@@ #{one_line_header} @@
@@ -325,7 +325,7 @@ def inspect; "<BrokenObject>"; end
           expect(diff).to be_diffed_as(expected_diff)
         end
 
-        it 'outputs unified diff message of two hashes with encoding different to key encoding', :failing_on_appveyor do
+        it 'outputs unified diff message of two hashes with encoding different to key encoding' do
           expected_diff = dedent(<<-"EOD")
             |
             |@@ #{one_line_header} @@

spec/rspec/support/differ_spec.rb

@@ -28,9 +28,7 @@ def directory_exists?(dirname)
       context "when a file already exists" do
         before { File.open("tmp", "w") }
 
-        it "raises, as it can't make the directory", :failing_on_appveyor,
-           :pending => false,
-           :skip => (ENV['APPVEYOR'] ? "Failing on AppVeyor but :pending isn't working for some reason" : false) do
+        it "raises, as it can't make the directory", :failing_on_windows_ci do
           expect {
             mkdir_p.call(dirname)
           }.to raise_error(Errno::EEXIST)

spec/rspec/support/directory_maker_spec.rb

@@ -32,7 +32,7 @@
     stderr_methods -= [:birthtime] if RUBY_VERSION =~ /^2\.2/
 
     # No idea why, but on our AppVeyor windows builds it doesn't respond to these...
-    stderr_methods -= [:close_on_exec?, :close_on_exec=] if RSpec::Support::OS.windows?
+    stderr_methods -= [:close_on_exec?, :close_on_exec=] if RSpec::Support::OS.windows? && ENV['CI']
 
     expect(splitter).to respond_to(*stderr_methods)
   end