Merge pull request #1424 from rspec/update-ci-build-scripts-2023-06-2…

…6-for-3-12-maintenance Updates from rspec-dev (2023-06-26)
rspec · Jun 26, 2023 · 1f762f6 · 1f762f6
2 parents df704eb + fc91cf0
commit 1f762f6
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 20 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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.
 
 version: 2

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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
@@ -150,5 +150,5 @@ jobs:
           bundler: '2.2.22'
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: cinst ansicon
+      - run: choco install ansicon
       - run: bundle exec rspec --backtrace
diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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,9 +1,9 @@
-# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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:
 # https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
-travis_retry() {
+ci_retry() {
   local result=0
   local count=1
   while [ $count -le 3 ]; do

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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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 )"
@@ -25,7 +25,7 @@ function clone_repo {
       BRANCH_TO_CLONE="$2";
     fi;
 
-    travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
+    ci_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
   fi;
 }
 
@@ -89,16 +89,16 @@ function run_spec_suite_for {
       pushd ../$1
       unset BUNDLE_GEMFILE
       bundle_install_flags=`cat .github/workflows/ci.yml | grep "bundle install" | sed 's/.* bundle install//'`
-      travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
-      travis_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
+      ci_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
+      ci_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
       run_specs_and_record_done
       popd
     else
       echo ""
       echo "WARNING: The ../$1 directory does not exist. Usually the"
-      echo "travis build cds into that directory and run the specs to"
-      echo "ensure the specs still pass with your latest changes, but"
-      echo "we are going to skip that step."
+      echo "build cds into that directory and run the specs to ensure"
+      echo "the specs still pass with your latest changes, but we are"
+      echo "going to skip that step."
       echo ""
     fi;
   fi;

diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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/run_rubocop b/script/run_rubocop
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:07+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