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

Updates from rspec-dev (2021-01-02) #483

Merged
merged 1 commit into from
Jan 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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 @@ -67,6 +67,26 @@ jobs:
- run: bundle install --binstubs --standalone
- run: script/run_build

legacy:
name: Legacy Ruby Builds (${{ matrix.container.version }})
runs-on: ubuntu-20.04
container: ${{ matrix.container.tag }}
strategy:
fail-fast: false
matrix:
container:
- version: "2.0"
tag: rspec/ci:2.0.0
- version: "1.9.3"
tag: rspec/ci:1.9.3
env:
LEGACY_CI: true
steps:
- uses: actions/checkout@v2
- run: script/legacy_setup.sh
- run: bundle exec bin/rspec
- run: bundle exec script/cucumber.sh

windows:
name: Ruby ${{ matrix.ruby }} (Windows)
runs-on: windows-latest
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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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.

# In order to install old Rubies, we need to use old Ubuntu distibution.
Expand All @@ -17,8 +17,6 @@ script: "script/run_build"
rvm:
- 1.8.7
- 1.9.2
- 1.9.3
- 2.0.0
- ree
- jruby-1.7
env:
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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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
8 changes: 8 additions & 0 deletions script/cucumber.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
# This file was generated on 2021-01-02T12:38:45+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
source script/functions.sh

run_cukes
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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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
20 changes: 20 additions & 0 deletions script/legacy_setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#!/bin/bash
# This file was generated on 2021-01-02T12:38:45+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
source script/functions.sh

bundle install --standalone --binstubs

if [ -x ./bin/rspec ]; then
echo "RSpec bin detected"
else
if [ -x ./exe/rspec ]; then
cp ./exe/rspec ./bin/rspec
echo "RSpec restored from exe"
else
echo "No RSpec bin available"
exit 1
fi
fi
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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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
3 changes: 1 addition & 2 deletions script/run_build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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 Expand Up @@ -30,7 +30,6 @@ fi

if supports_cross_build_checks; then
fold "one-by-one specs" run_specs_one_by_one
export NO_COVERAGE=true
run_all_spec_suites
else
echo "Skipping the rest of the build on non-MRI rubies"
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 2020-12-31T00:41:35+03:00 from the rspec-dev repo.
# This file was generated on 2021-01-02T12:38:45+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