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

Commit 3c16c97

Browse files
authored
Merge pull request #489 from rspec/update-ci-build-scripts-2021-01-22-for-3-10-maintenance
Updates from rspec-dev (2021-01-22)
2 parents 34968a4 + 34f6c85 commit 3c16c97

11 files changed

+28
-18
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
1+
# This file was generated on 2021-01-22T11:27:18+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
@@ -70,7 +70,9 @@ jobs:
7070
legacy:
7171
name: Legacy Ruby Builds (${{ matrix.container.version }})
7272
runs-on: ubuntu-20.04
73-
container: ${{ matrix.container.tag }}
73+
container:
74+
image: ${{ matrix.container.tag }}
75+
options: ${{ matrix.container.options || '--add-host github-complains-if-this-is-empty.com:127.0.0.1' }}
7476
strategy:
7577
fail-fast: false
7678
matrix:
@@ -79,13 +81,25 @@ jobs:
7981
tag: rspec/ci:2.0.0
8082
- version: "1.9.3"
8183
tag: rspec/ci:1.9.3
84+
- version: "1.9.2"
85+
tag: rspec/ci:1.9.2
86+
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
87+
- version: "REE"
88+
tag: rspec/ci:ree
89+
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
8290
- version: "JRuby 1.7"
8391
tag: rspec/ci:jruby-1.7
92+
- version: "JRuby 1.7 1.8 mode"
93+
tag: rspec/ci:jruby-1.7
94+
jruby_opts: '--dev --1.8'
95+
pre: gem uninstall jruby-openssl
96+
options: "--add-host rubygems.org:151.101.0.70 --add-host api.rubygems.org:151.101.0.70"
8497
env:
8598
LEGACY_CI: true
8699
JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
87100
steps:
88101
- uses: actions/checkout@v2
102+
- run: ${{ matrix.container.pre }}
89103
- run: script/legacy_setup.sh
90104
- run: bundle exec bin/rspec
91105
- run: bundle exec script/cucumber.sh

.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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
1+
# This file was generated on 2021-01-22T11:27:18+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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
1+
# This file was generated on 2021-01-22T11:27:18+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.
@@ -16,12 +16,7 @@ bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
1616
script: "script/run_build"
1717
rvm:
1818
- 1.8.7
19-
- 1.9.2
20-
- ree
2119
matrix:
22-
include:
23-
- rvm: jruby-1.7
24-
env: JRUBY_OPTS='--dev --1.8'
2520
fast_finish: true
2621
branches:
2722
only:

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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
1+
# This file was generated on 2021-01-22T11:27:18+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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
2+
# This file was generated on 2021-01-22T11:27:18+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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
2+
# This file was generated on 2021-01-22T11:27:18+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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
1+
# This file was generated on 2021-01-22T11:27:18+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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
2-
# This file was generated on 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
2+
# This file was generated on 2021-01-22T11:27:18+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
66
source script/functions.sh
77

8-
bundle install --standalone --binstubs
8+
bundle install --standalone --binstubs --without coverage documentation
99

1010
if [ -x ./bin/rspec ]; then
1111
echo "RSpec bin detected"

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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
1+
# This file was generated on 2021-01-22T11:27:18+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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
2+
# This file was generated on 2021-01-22T11:27:18+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
@@ -30,6 +30,7 @@ fi
3030

3131
if supports_cross_build_checks; then
3232
fold "one-by-one specs" run_specs_one_by_one
33+
export NO_COVERAGE=true
3334
run_all_spec_suites
3435
else
3536
echo "Skipping the rest of the build on non-MRI rubies"

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 2021-01-08T09:17:14+00:00 from the rspec-dev repo.
2+
# This file was generated on 2021-01-22T11:27:18+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

0 commit comments

Comments
 (0)