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

Commit 1eecd92

Browse files
committed
Updated ci build scripts (from rspec-dev)4-0-dev
1 parent 9d734ac commit 1eecd92

File tree

8 files changed

+23
-20
lines changed

8 files changed

+23
-20
lines changed

.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 2020-12-31T00:51:11+03:00 from the rspec-dev repo.
1+
# This file was generated on 2021-07-13T11:08:51+01: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
@@ -50,11 +50,12 @@ jobs:
5050
- uses: actions/checkout@v2
5151
- uses: ruby/setup-ruby@v1
5252
with:
53-
bundler: ${{ matrix.bundler || 2 }}
53+
bundler: ${{ matrix.bundler || '2.2.22' }}
5454
ruby-version: ${{ matrix.ruby }}
5555
- run: script/update_rubygems_and_install_bundler
5656
- run: script/clone_all_rspec_repos
57-
- run: bundle install --binstubs --standalone
57+
- run: bundle install --standalone
58+
- run: bundle binstubs --all
5859
- run: script/run_build
5960

6061
windows:
@@ -73,7 +74,7 @@ jobs:
7374
- uses: actions/checkout@v2
7475
- uses: ruby/setup-ruby@v1
7576
with:
76-
bundler: 2
77+
bundler: '2.2.22'
7778
ruby-version: ${{ matrix.ruby }}
7879
bundler-cache: true
7980
- run: cinst ansicon

.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-31T00:51:11+03:00 from the rspec-dev repo.
1+
# This file was generated on 2021-07-13T11:08:51+01: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

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-31T00:51:11+03:00 from the rspec-dev repo.
1+
# This file was generated on 2021-07-13T11:08:51+01: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-31T00:51:11+03:00 from the rspec-dev repo.
2+
# This file was generated on 2021-07-13T11:08:51+01: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: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-12-31T00:51:11+03:00 from the rspec-dev repo.
1+
# This file was generated on 2021-07-13T11:08:51+01: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 )"
@@ -139,10 +139,7 @@ function check_binstubs {
139139
echo " $ bundle binstubs$gems"
140140
echo
141141
echo " # To binstub all gems"
142-
echo " $ bundle install --binstubs"
143-
echo
144-
echo " # To binstub all gems and avoid loading bundler"
145-
echo " $ bundle install --binstubs --standalone"
142+
echo " $ bundle binstubs --all"
146143
fi
147144

148145
return $success

script/predicate_functions.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-12-31T00:51:11+03:00 from the rspec-dev repo.
1+
# This file was generated on 2021-07-13T11:08:51+01: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 {
@@ -129,9 +129,13 @@ function documentation_enforced {
129129
}
130130

131131
function style_and_lint_enforced {
132-
if [ -x ./bin/rubocop ]; then
133-
return 0
134-
else
132+
if is_ruby_head; then
135133
return 1
134+
else
135+
if [ -x ./bin/rubocop ]; then
136+
return 0
137+
else
138+
return 1
139+
fi
136140
fi
137141
}

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 2020-12-31T00:51:11+03:00 from the rspec-dev repo.
2+
# This file was generated on 2021-07-13T11:08:51+01: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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
2-
# This file was generated on 2020-12-31T00:51:11+03:00 from the rspec-dev repo.
2+
# This file was generated on 2021-07-13T11:08:51+01: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

88
if is_ruby_23_plus; then
9-
yes | gem update --system
10-
yes | gem install bundler
9+
yes | gem update --system '3.2.22'
10+
yes | gem install bundler -v '2.2.22'
1111
else
1212
echo "Warning installing older versions of Rubygems / Bundler"
1313
gem update --system '2.7.8'

0 commit comments

Comments
 (0)