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

Commit d389f52

Browse files
authored
Merge pull request #454 from rspec/update-ci-build-scripts-2020-12-21-for-main
Updates from rspec-dev (2020-12-21)
2 parents b3a075a + ed32a44 commit d389f52

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-21T19:41:57+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
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
ruby:
21-
- 3.0.0-preview2
21+
- 3.0.0-rc1
2222
- 2.7
2323
- 2.6
2424
- 2.5

.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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-21T19:41:57+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

.travis.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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-21T19:41:57+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
# In order to install old Rubies, we need to use old Ubuntu distibution.

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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-21T19:41:57+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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-12-21T19:41:57+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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-21T19:41:57+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/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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-21T19:41:57+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 {

script/run_build

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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-12-21T19:41:57+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/update_rubygems_and_install_bundler

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 2020-12-09T08:28:47+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-12-21T19:41:57+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

spec/rspec/support/spec/stderr_splitter_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888

8989
unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
9090
it 'will fail an example which generates a warning' do
91-
true unless @undefined
91+
true unless $undefined
9292
expect { splitter.verify_no_warnings! }.to raise_error(/Warnings were generated:/)
9393
end
9494
end

0 commit comments

Comments
 (0)