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

JonRowe · JonRowe · commit b51ec282c812 · 2020-12-27T13:31:19.000Z
Updates from rspec-dev (2020-11-16)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,38 @@
+# This file was generated on 2020-11-16T09:31:10+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
+on: [pull_request, push]
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }}
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby:
+          - 3.0.0-preview1
+          - 2.7
+          - 2.6
+          - 2.5
+          - 2.4
+          - 2.3
+          - 2.2
+          - 2.1.9
+          - ruby-head
+      fail-fast: false
+    continue-on-error: ${{ matrix.ruby == 'jruby-9.2.13.0' || endsWith(matrix.ruby, 'head') }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler: ${{ (matrix.ruby == 'jruby-9.1.17.0' && 1) || 2 }}
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - uses: actions/cache@v2
+        with:
+          path: ../bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}
+      - run: script/update_rubygems_and_install_bundler
+      - run: script/clone_all_rspec_repos
+      - run: bundle install --binstubs --standalone
+      - run: script/run_build
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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.
@@ -19,15 +19,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2.10
-  - 2.3.8
-  - 2.4.10
-  - 2.5.8
-  - 2.6.6
-  - 2.7.1
-  - ruby-3.0.0-preview1
-  - ruby-head
   - ree
   - rbx-3
   - jruby-9.1.7.0 # pin JRuby to this until travis/rvm can install later versions
@@ -52,3 +43,4 @@ branches:
   only:
     - main
     - /^\d+-\d+-maintenance$/
+    - /^\d+-\d+-dev$/
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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.
 
 version: "{build}"
diff --git a/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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:
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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
diff --git a/script/functions.sh b/script/functions.sh
@@ -1,8 +1,8 @@
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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 )"
-source $SCRIPT_DIR/travis_functions.sh
+source $SCRIPT_DIR/ci_functions.sh
 source $SCRIPT_DIR/predicate_functions.sh
 
 # If JRUBY_OPTS isn't set, use these.
diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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 {
diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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
diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.
+# This file was generated on 2020-11-16T09:31:10+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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2020-09-28T21:53:37+02:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2020-11-16T09:31:10+00:00 from the rspec-dev repo.`
`2`	`2`	`# DO NOT modify it by hand as your changes will get lost the next time it is generated.`
`3`	`3`
`4`	`4`	`# This file contains defaults for RSpec projects. Individual projects`