From 0cc9d87ab72d106684c16d772c8a9811fc0a367a Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 26 Dec 2023 21:12:36 +0000 Subject: [PATCH 1/2] Updated ci build scripts (from rspec-dev) 3-12-maintenance --- .github/dependabot.yml | 2 +- .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 | 2 +- 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, 16 insertions(+), 15 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a7ca0cf55..2d1c0c4f7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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. version: 2 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4e463154f..402863b27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 @@ -25,7 +25,7 @@ jobs: name: Rubocop runs-on: 'ubuntu-20.04' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: ruby-version: '3.0' @@ -41,6 +41,7 @@ jobs: strategy: matrix: ruby: + - '3.3' - '3.2' - '3.1' - '3.0' @@ -72,7 +73,7 @@ jobs: continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }} env: ${{ matrix.env }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: bundler: ${{ matrix.bundler || '2.2.22' }} @@ -144,7 +145,7 @@ jobs: - 2.2 fail-fast: false steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: bundler: '2.2.22' diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 558ed3385..01c30349b 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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/script/ci_functions.sh b/script/ci_functions.sh index 4f79924e1..d86b795c4 100644 --- a/script/ci_functions.sh +++ b/script/ci_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 index e51de3290..adf3d7a85 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-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 index 682928737..fe06f4cb6 100755 --- a/script/cucumber.sh +++ b/script/cucumber.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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/functions.sh b/script/functions.sh index 3536afdc9..3e01ed239 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 index a64a06828..1f9079cc7 100755 --- a/script/legacy_setup.sh +++ b/script/legacy_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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/predicate_functions.sh b/script/predicate_functions.sh index 046c88f33..4062989ac 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 index e658462bb..92ade3827 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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/run_rubocop b/script/run_rubocop index cc3610dbc..a2bf9ea2d 100755 --- a/script/run_rubocop +++ b/script/run_rubocop @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 index 9e7681922..db1899c48 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-06-26T14:08:07+01:00 from the rspec-dev repo. +# This file was generated on 2023-12-26T21:12:36+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 From 8d6b69109d4ce5d7afa75850501a3d8c5916eb2f Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Tue, 26 Dec 2023 16:55:15 +0000 Subject: [PATCH 2/2] Merge pull request #3058 from rspec/fix-diff-lcs-build Run older diff-lcs on older version of activesupport --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 521807c5d..857bc53a1 100644 --- a/Gemfile +++ b/Gemfile @@ -96,6 +96,9 @@ end if RUBY_VERSION < '2.0.0' gem 'cucumber', "<= 1.3.22" +elsif !ENV['DIFF_LCS_VERSION'].to_s.empty? && ENV['DIFF_LCS_VERSION'].scan(/\d\.\d/).first.to_f < 1.5 + # Older version of diff-lcs cause a downstream error with cucumber and modern rails + gem "activesupport", "< 7" end gem 'contracts', '< 0.16' if RUBY_VERSION < '1.9.0'