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

Commit 094f448

Browse files
committed
Updated ci build scripts (from rspec-dev)
1 parent 12069e1 commit 094f448

File tree

9 files changed

+20
-11
lines changed

9 files changed

+20
-11
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: 12 additions & 3 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 )"
@@ -19,7 +19,13 @@ fi
1919

2020
function clone_repo {
2121
if [ ! -d $1 ]; then # don't clone if the dir is already there
22-
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $MAINTENANCE_BRANCH"
22+
if [ -z "$2" ]; then
23+
BRANCH_TO_CLONE="$MAINTENANCE_BRANCH"
24+
else
25+
BRANCH_TO_CLONE="$2"
26+
fi
27+
28+
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch $BRANCH_TO_CLONE"
2329
fi;
2430
}
2531

@@ -82,7 +88,10 @@ function run_spec_suite_for {
8288
echo "Running specs for $1"
8389
pushd ../$1
8490
unset BUNDLE_GEMFILE
85-
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
8695
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
8796
run_specs_and_record_done
8897
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)