Skip to content

Commit 3ae61bf

Browse files
committed
Merge pull request #313 from rspec/fix-windows
Some build updates
1 parent 714b5a5 commit 3ae61bf

File tree

5 files changed

+13
-15
lines changed

5 files changed

+13
-15
lines changed

ci/.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,5 +147,5 @@ jobs:
147147
bundler: '2.2.22'
148148
ruby-version: ${{ matrix.ruby }}
149149
bundler-cache: true
150-
- run: cinst ansicon
150+
- run: choco install ansicon
151151
- run: bundle exec rspec --backtrace

ci/script/ci_functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Taken from:
22
# https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
3-
travis_retry() {
3+
ci_retry() {
44
local result=0
55
local count=1
66
while [ $count -le 3 ]; do

ci/script/functions.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function clone_repo {
2222
BRANCH_TO_CLONE="$2";
2323
fi;
2424

25-
travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
25+
ci_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
2626
fi;
2727
}
2828

@@ -86,16 +86,16 @@ function run_spec_suite_for {
8686
pushd ../$1
8787
unset BUNDLE_GEMFILE
8888
bundle_install_flags=`cat .github/workflows/ci.yml | grep "bundle install" | sed 's/.* bundle install//'`
89-
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
90-
travis_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
89+
ci_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
90+
ci_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
9191
run_specs_and_record_done
9292
popd
9393
else
9494
echo ""
9595
echo "WARNING: The ../$1 directory does not exist. Usually the"
96-
echo "travis build cds into that directory and run the specs to"
97-
echo "ensure the specs still pass with your latest changes, but"
98-
echo "we are going to skip that step."
96+
echo "build cds into that directory and run the specs to ensure"
97+
echo "the specs still pass with your latest changes, but we are"
98+
echo "going to skip that step."
9999
echo ""
100100
fi;
101101
fi;

common_plaintext_files/BUILD_DETAIL.md.erb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
# The CI build, in detail
22

3-
The [Travis CI build](https://travis-ci.org/rspec/<%= project_name %>)
4-
runs many verification steps to prevent regressions and
5-
ensure high-quality code. To run the Travis build locally, run:
3+
The build runs many verification steps to prevent regressions and
4+
ensure high-quality code. To run the build locally, run:
65

76
```
87
$ script/run_build
98
```
109

1110
It can be useful to run the build steps individually
12-
to repro a failing part of a Travis build. Let's break
11+
to repro a failing part of a build. Let's break
1312
the build down into the individual steps.
1413

1514
## Specs

common_plaintext_files/DEVELOPMENT.md.erb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ gem declarations. The `Gemfile` evaluates that file if it exists, and it is git-
8080

8181
# Running the build
8282

83-
The [Travis CI build](https://travis-ci.org/rspec/<%= project_name %>)
84-
runs many verification steps to prevent regressions and
85-
ensure high-quality code. To run the Travis build locally, run:
83+
The CI build runs many verification steps to prevent regressions and
84+
ensure high-quality code. To run the build locally, run:
8685

8786
```
8887
$ script/run_build

0 commit comments

Comments
 (0)