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

Commit dc12308

Browse files
authored
Merge pull request #3042 from rspec/update-ci-build-scripts-2023-06-26-for-3-12-maintenance
Updates from rspec-dev (2023-06-26)
2 parents 2fd36ed + eace2b9 commit dc12308

12 files changed

+20
-20
lines changed

.github/dependabot.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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-06-26T14:08:07+01: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
version: 2

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-06-26T14:08:07+01: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
@@ -150,5 +150,5 @@ jobs:
150150
bundler: '2.2.22'
151151
ruby-version: ${{ matrix.ruby }}
152152
bundler-cache: true
153-
- run: cinst ansicon
153+
- run: choco install ansicon
154154
- run: bundle exec rspec --backtrace

.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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-06-26T14:08:07+01: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

script/ci_functions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-06-26T14:08:07+01: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:
55
# https://github.com/travis-ci/travis-build/blob/e9314616e182a23e6a280199cd9070bfc7cae548/lib/travis/build/script/templates/header.sh#L34-L53
6-
travis_retry() {
6+
ci_retry() {
77
local result=0
88
local count=1
99
while [ $count -le 3 ]; do

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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-06-26T14:08:07+01: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/cucumber.sh

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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-06-26T14:08:07+01: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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-06-26T14:08:07+01: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 )"
@@ -25,7 +25,7 @@ function clone_repo {
2525
BRANCH_TO_CLONE="$2";
2626
fi;
2727

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

@@ -89,16 +89,16 @@ function run_spec_suite_for {
8989
pushd ../$1
9090
unset BUNDLE_GEMFILE
9191
bundle_install_flags=`cat .github/workflows/ci.yml | grep "bundle install" | sed 's/.* bundle install//'`
92-
travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
93-
travis_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
92+
ci_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
93+
ci_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
9494
run_specs_and_record_done
9595
popd
9696
else
9797
echo ""
9898
echo "WARNING: The ../$1 directory does not exist. Usually the"
99-
echo "travis build cds into that directory and run the specs to"
100-
echo "ensure the specs still pass with your latest changes, but"
101-
echo "we are going to skip that step."
99+
echo "build cds into that directory and run the specs to ensure"
100+
echo "the specs still pass with your latest changes, but we are"
101+
echo "going to skip that step."
102102
echo ""
103103
fi;
104104
fi;

script/legacy_setup.sh

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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-06-26T14:08:07+01: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/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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
1+
# This file was generated on 2023-06-26T14:08:07+01: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 2023-04-11T15:33:34+01:00 from the rspec-dev repo.
2+
# This file was generated on 2023-06-26T14:08:07+01: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)