From 6097d53c3391cf5c88b57ce523a7d7d0f7722975 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 13 Jul 2021 11:04:09 +0100 Subject: [PATCH] Updated ci build scripts (from rspec-dev)3-10-maintenance --- .github/workflows/ci.yml | 9 +++++---- .rubocop_rspec_base.yml | 2 +- script/ci_functions.sh | 2 +- script/clone_all_rspec_repos | 2 +- script/cucumber.sh | 2 +- script/functions.sh | 7 ++----- script/legacy_setup.sh | 2 +- script/predicate_functions.sh | 12 ++++++++---- script/run_build | 2 +- script/update_rubygems_and_install_bundler | 6 +++--- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 069d3f9f..9a38ce16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 @@ -60,11 +60,12 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - bundler: ${{ matrix.bundler || 2 }} + bundler: ${{ matrix.bundler || '2.2.22' }} ruby-version: ${{ matrix.ruby }} - run: script/update_rubygems_and_install_bundler - run: script/clone_all_rspec_repos - - run: bundle install --binstubs --standalone + - run: bundle install --standalone + - run: bundle binstubs --all - run: script/run_build legacy: @@ -125,7 +126,7 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - bundler: 2 + bundler: '2.2.22' ruby-version: ${{ matrix.ruby }} bundler-cache: true - run: cinst ansicon diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index a9ac2ae7..2b37f9c7 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 0b72a17b..1cdd4275 100644 --- a/script/ci_functions.sh +++ b/script/ci_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 index ed10bc9a..7fc7fe88 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 9d513349..6b72ce37 100755 --- a/script/cucumber.sh +++ b/script/cucumber.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 4eaf02e6..effc6165 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 )" @@ -139,10 +139,7 @@ function check_binstubs { echo " $ bundle binstubs$gems" echo echo " # To binstub all gems" - echo " $ bundle install --binstubs" - echo - echo " # To binstub all gems and avoid loading bundler" - echo " $ bundle install --binstubs --standalone" + echo " $ bundle binstubs --all" fi return $success diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh index 9b53fdbc..dff0c3e3 100755 --- a/script/legacy_setup.sh +++ b/script/legacy_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 020dd4ab..08d57895 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 { @@ -129,9 +129,13 @@ function documentation_enforced { } function style_and_lint_enforced { - if [ -x ./bin/rubocop ]; then - return 0 - else + if is_ruby_head; then return 1 + else + if [ -x ./bin/rubocop ]; then + return 0 + else + return 1 + fi fi } diff --git a/script/run_build b/script/run_build index 45a2b307..f15356fb 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 770ac711..45a74af2 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -1,13 +1,13 @@ #!/bin/bash -# This file was generated on 2021-04-23T10:26:09+01:00 from the rspec-dev repo. +# This file was generated on 2021-07-13T11:04:09+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 source script/functions.sh if is_ruby_23_plus; then - yes | gem update --system - yes | gem install bundler + yes | gem update --system '3.2.22' + yes | gem install bundler -v '2.2.22' else echo "Warning installing older versions of Rubygems / Bundler" gem update --system '2.7.8'