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

Commit d39b74a

Browse files
committed
Merge pull request #446 from rspec/update-ci-build-scripts-2020-12-08-for-main
Updates from rspec-dev (2020-12-08)
1 parent 4e0ec40 commit d39b74a

File tree

9 files changed

+13
-10
lines changed

9 files changed

+13
-10
lines changed

.github/workflows/ci.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-11-22T07:41:13+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-08T21:16:19+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

.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-11-22T07:41:13+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-08T21:16:19+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-11-22T07:41:13+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-08T21:16:19+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-11-22T07:41:13+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-08T21:16:19+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-11-22T07:41:13+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-12-08T21:16:19+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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2020-11-22T07:41:13+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-08T21:16:19+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 )"
@@ -88,7 +88,10 @@ function run_spec_suite_for {
8888
echo "Running specs for $1"
8989
pushd ../$1
9090
unset BUNDLE_GEMFILE
91-
bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
91+
bundle_install_flags=""
92+
if [ -e .travis.yml ]; then
93+
bundle_install_flags=`cat .travis.yml | grep bundler_args | tr -d '"' | grep -o " .*"`
94+
fi
9295
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
9396
run_specs_and_record_done
9497
popd

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-11-22T07:41:13+00:00 from the rspec-dev repo.
1+
# This file was generated on 2020-12-08T21:16:19+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-11-22T07:41:13+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-12-08T21:16:19+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-11-22T07:41:13+00:00 from the rspec-dev repo.
2+
# This file was generated on 2020-12-08T21:16:19+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)