Merge pull request #499 from rspec/update-ci-build-scripts-2021-04-23-for-main

JonRowe · web-flow · commit d63133f47840 · 2021-04-23T10:12:02.000+01:00
Updates from rspec-dev (2021-04-23)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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
@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 3.0
+          - '3.0'
           - 2.7
           - 2.6
           - 2.5
@@ -83,20 +83,20 @@ jobs:
             tag: rspec/ci:1.9.3
           - version: "1.9.2"
             tag: rspec/ci:1.9.2
-            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
+            options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "1.8.7"
             tag: rspec/ci:1.8.7
-            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
+            options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "REE"
             tag: rspec/ci:ree
-            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
+            options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "JRuby 1.7"
             tag: rspec/ci:jruby-1.7
           - version: "JRuby 1.7 1.8 mode"
             tag: rspec/ci:jruby-1.7
             jruby_opts: '--dev --1.8'
             pre: gem uninstall jruby-openssl
-            options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
+            options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
     env:
       LEGACY_CI: true
       JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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/script/ci_functions.sh b/script/ci_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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,4 +1,4 @@
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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 2021-01-22T18:13:36+00:00 from the rspec-dev repo.
+# This file was generated on 2021-04-23T09:17:32+01: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
@@ -13,8 +13,3 @@ else
   gem update --system '2.7.8'
   gem install bundler -v '1.17.3'
 fi
-
-echo "Setup complete"
-ruby -v
-gem -v
-bundler -v

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# This file was generated on 2021-01-22T18:13:36+00:00 from the rspec-dev repo.`
	`1`	`+# This file was generated on 2021-04-23T09:17:32+01: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`