Skip to content

Commit

Permalink
Merge pull request #1560 from rspec/update-ci-build-scripts-2023-12-2…
Browse files Browse the repository at this point in the history
…5-for-main

Updates from rspec-dev (2023-12-25)
  • Loading branch information
JonRowe committed Dec 26, 2023
2 parents 868bf98 + 7b70fce commit 15599ee
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down Expand Up @@ -41,6 +41,7 @@ jobs:
strategy:
matrix:
ruby:
- '3.3'
- '3.2'
- '3.1'
- '3.0'
Expand Down
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
2 changes: 1 addition & 1 deletion rspec-mocks.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rake', '> 10.0.0'
s.add_development_dependency 'cucumber', '>= 1.3'
if RUBY_VERSION.to_f >= 2.4
s.add_development_dependency 'aruba', '~> 1.1'
s.add_development_dependency 'aruba', '>= 1.1.0', '< 3.0.0'
else
s.add_development_dependency 'aruba', '~> 0.14.10'
end
Expand Down
2 changes: 1 addition & 1 deletion script/ci_functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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:
Expand Down
2 changes: 1 addition & 1 deletion script/clone_all_rspec_repos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
2 changes: 1 addition & 1 deletion script/cucumber.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
2 changes: 1 addition & 1 deletion script/functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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 )"
Expand Down
2 changes: 1 addition & 1 deletion script/legacy_setup.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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 {
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
2 changes: 1 addition & 1 deletion script/run_rubocop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down
2 changes: 1 addition & 1 deletion script/update_rubygems_and_install_bundler
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-09-11T12:14:10+01:00 from the rspec-dev repo.
# This file was generated on 2023-12-25T16:07:49+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
Expand Down

0 comments on commit 15599ee

Please sign in to comment.