Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 8160ac4

Browse files
authored
Merge pull request #3060 from rspec/update-ci-build-scripts-2023-12-26-for-3-12-maintenance
Updates from rspec-dev (2023-12-26)
2 parents 27b93d6 + 8d6b691 commit 8160ac4

File tree

13 files changed

+19
-15
lines changed

13 files changed

+19
-15
lines changed

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
version: 2

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
name: RSpec CI
@@ -25,7 +25,7 @@ jobs:
2525
name: Rubocop
2626
runs-on: 'ubuntu-20.04'
2727
steps:
28-
- uses: actions/checkout@v3
28+
- uses: actions/checkout@v4
2929
- uses: ruby/setup-ruby@v1
3030
with:
3131
ruby-version: '3.0'
@@ -41,6 +41,7 @@ jobs:
4141
strategy:
4242
matrix:
4343
ruby:
44+
- '3.3'
4445
- '3.2'
4546
- '3.1'
4647
- '3.0'
@@ -72,7 +73,7 @@ jobs:
7273
continue-on-error: ${{ matrix.allow_failure || endsWith(matrix.ruby, 'head') }}
7374
env: ${{ matrix.env }}
7475
steps:
75-
- uses: actions/checkout@v3
76+
- uses: actions/checkout@v4
7677
- uses: ruby/setup-ruby@v1
7778
with:
7879
bundler: ${{ matrix.bundler || '2.2.22' }}
@@ -144,7 +145,7 @@ jobs:
144145
- 2.2
145146
fail-fast: false
146147
steps:
147-
- uses: actions/checkout@v3
148+
- uses: actions/checkout@v4
148149
- uses: ruby/setup-ruby@v1
149150
with:
150151
bundler: '2.2.22'

.rubocop_rspec_base.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# This file contains defaults for RSpec projects. Individual projects

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ end
9696

9797
if RUBY_VERSION < '2.0.0'
9898
gem 'cucumber', "<= 1.3.22"
99+
elsif !ENV['DIFF_LCS_VERSION'].to_s.empty? && ENV['DIFF_LCS_VERSION'].scan(/\d\.\d/).first.to_f < 1.5
100+
# Older version of diff-lcs cause a downstream error with cucumber and modern rails
101+
gem "activesupport", "< 7"
99102
end
100103

101104
gem 'contracts', '< 0.16' if RUBY_VERSION < '1.9.0'

script/ci_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
# Taken from:

script/clone_all_rspec_repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/cucumber.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/legacy_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
33
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
44

55
set -e

script/predicate_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-12-26T21:12:36+00:00 from the rspec-dev repo.
22
# DO NOT modify it by hand as your changes will get lost the next time it is generated.
33

44
function is_mri {

0 commit comments

Comments
 (0)