Skip to content

Commit

Permalink
Updated ci build scripts (from rspec-dev) 3-12-maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
JonRowe committed Jun 26, 2023
1 parent 8d50b95 commit 9c7273a
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

version: 2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

name: RSpec CI
Expand Down Expand Up @@ -150,5 +150,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 .rubocop_rspec_base.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# This file contains defaults for RSpec projects. Individual projects
Expand Down
4 changes: 2 additions & 2 deletions script/ci_functions.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

# 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
2 changes: 1 addition & 1 deletion script/clone_all_rspec_repos
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/cucumber.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
14 changes: 7 additions & 7 deletions script/functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand All @@ -25,7 +25,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 @@ -89,16 +89,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
2 changes: 1 addition & 1 deletion script/legacy_setup.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/predicate_functions.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

function is_mri {
Expand Down
2 changes: 1 addition & 1 deletion script/run_build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/run_rubocop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down
2 changes: 1 addition & 1 deletion script/update_rubygems_and_install_bundler
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
# This file was generated on 2023-06-26T14:08:07+01:00 from the rspec-dev repo.
# DO NOT modify it by hand as your changes will get lost the next time it is generated.

set -e
Expand Down

0 comments on commit 9c7273a

Please sign in to comment.