Skip to content

Some build updates #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,5 @@ jobs:
bundler: '2.2.22'
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: cinst ansicon
- run: choco install ansicon
- run: bundle exec rspec --backtrace
2 changes: 1 addition & 1 deletion ci/script/ci_functions.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Taken from:
# https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
travis_retry() {
ci_retry() {
local result=0
local count=1
while [ $count -le 3 ]; do
Expand Down
12 changes: 6 additions & 6 deletions ci/script/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function clone_repo {
BRANCH_TO_CLONE="$2";
fi;

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

Expand Down Expand Up @@ -86,16 +86,16 @@ function run_spec_suite_for {
pushd ../$1
unset BUNDLE_GEMFILE
bundle_install_flags=`cat .github/workflows/ci.yml | grep "bundle install" | sed 's/.* bundle install//'`
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
travis_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
ci_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
ci_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
run_specs_and_record_done
popd
else
echo ""
echo "WARNING: The ../$1 directory does not exist. Usually the"
echo "travis build cds into that directory and run the specs to"
echo "ensure the specs still pass with your latest changes, but"
echo "we are going to skip that step."
echo "build cds into that directory and run the specs to ensure"
echo "the specs still pass with your latest changes, but we are"
echo "going to skip that step."
echo ""
fi;
fi;
Expand Down
7 changes: 3 additions & 4 deletions common_plaintext_files/BUILD_DETAIL.md.erb
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# The CI build, in detail

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

```
$ script/run_build
```

It can be useful to run the build steps individually
to repro a failing part of a Travis build. Let's break
to repro a failing part of a build. Let's break
the build down into the individual steps.

## Specs
Expand Down
5 changes: 2 additions & 3 deletions common_plaintext_files/DEVELOPMENT.md.erb
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ gem declarations. The `Gemfile` evaluates that file if it exists, and it is git-

# Running the build

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

```
$ script/run_build
Expand Down