From 9c7273a1478f45f68f091b541508cf4b32d9b3bf Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Mon, 26 Jun 2023 14:08:08 +0100 Subject: [PATCH] Updated ci build scripts (from rspec-dev) 3-12-maintenance --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .rubocop_rspec_base.yml | 2 +- script/ci_functions.sh | 4 ++-- script/clone_all_rspec_repos | 2 +- script/cucumber.sh | 2 +- script/functions.sh | 14 +++++++------- script/legacy_setup.sh | 2 +- script/predicate_functions.sh | 2 +- script/run_build | 2 +- script/run_rubocop | 2 +- script/update_rubygems_and_install_bundler | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ca264f7b1..a7ca0cf55 100644 --- 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 index ac6443282..4e463154f 100644 --- 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 index 27489f12f..558ed3385 100644 --- 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 index d75bd9187..4f79924e1 100644 --- 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 index f2c9bc833..510aa1b54 100755 --- 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 index a5c1f94f2..682928737 100755 --- 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 index f575d3571..3536afdc9 100644 --- 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 index 780315296..a64a06828 100755 --- 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 index 965ec5863..046c88f33 100644 --- 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 index 5d0de9fc7..e658462bb 100755 --- 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 index 4ce4e8306..cc3610dbc 100755 --- 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 index 2b5188ef9..9e7681922 100755 --- 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