Merge pull request #1399 from rspec/update-ci-build-scripts-2021-01-08-for-3-10-maintenance

JonRowe · web-flow · commit c4d780913f7f · 2021-01-11T09:10:18.000Z
Updates from rspec-dev (2021-01-08)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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
@@ -67,6 +67,29 @@ jobs:
       - run: bundle install --binstubs --standalone
       - run: script/run_build
 
+  legacy:
+    name: Legacy Ruby Builds (${{ matrix.container.version }})
+    runs-on: ubuntu-20.04
+    container: ${{ matrix.container.tag }}
+    strategy:
+      fail-fast: false
+      matrix:
+        container:
+          - version: "2.0"
+            tag: rspec/ci:2.0.0
+          - version: "1.9.3"
+            tag: rspec/ci:1.9.3
+          - version: "JRuby 1.7"
+            tag: rspec/ci:jruby-1.7
+    env:
+      LEGACY_CI: true
+      JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
+    steps:
+      - uses: actions/checkout@v2
+      - run: script/legacy_setup.sh
+      - run: bundle exec bin/rspec
+      - run: bundle exec script/cucumber.sh
+
   windows:
     name: Ruby ${{ matrix.ruby }} (Windows)
     runs-on: windows-latest
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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.
@@ -17,12 +17,7 @@ script: "script/run_build"
 rvm:
   - 1.8.7
   - 1.9.2
-  - 1.9.3
-  - 2.0.0
   - ree
-  - jruby-1.7
-env:
-  - JRUBY_OPTS='--dev'
 matrix:
   include:
     - rvm: jruby-1.7
diff --git a/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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/cucumber.sh b/script/cucumber.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# This file was generated on 2021-01-08T09:17:13+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
+source script/functions.sh
+
+run_cukes
diff --git a/script/functions.sh b/script/functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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 )"
diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# This file was generated on 2021-01-08T09:17:13+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
+source script/functions.sh
+
+bundle install --standalone --binstubs
+
+if [ -x ./bin/rspec ]; then
+  echo "RSpec bin detected"
+else
+  if [ -x ./exe/rspec ]; then
+    cp ./exe/rspec ./bin/rspec
+    echo "RSpec restored from exe"
+  else
+    echo "No RSpec bin available"
+    exit 1
+  fi
+fi
diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2020-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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-12-27T14:29:50+00:00 from the rspec-dev repo.
+# This file was generated on 2021-01-08T09:17:13+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-12-27T14:29:50+00:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2021-01-08T09:17:13+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`