Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Updates from rspec-dev (2024-06-20) #3091

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Updates from rspec-dev (2024-06-20) #3091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
2 changes: 1 addition & 1 deletion .rubocop_rspec_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
30 changes: 3 additions & 27 deletions script/ci_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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:
Expand Down Expand Up @@ -30,41 +30,17 @@ nano_cmd="$(type -p gdate date | head -1)"
nano_format="+%s%N"
[ "$(uname -s)" != "Darwin" ] || nano_format="${nano_format/%N/000000000}"

travis_time_start() {
travis_timer_id=$(printf %08x $(( RANDOM * RANDOM )))
travis_start_time=$($nano_cmd -u "$nano_format")
printf "travis_time:start:%s\r\e[0m" $travis_timer_id
}

travis_time_finish() {
local travis_end_time=$($nano_cmd -u "$nano_format")
local duration=$(($travis_end_time-$travis_start_time))
printf "travis_time:end:%s:start=%s,finish=%s,duration=%s\r\e[0m" \
$travis_timer_id $travis_start_time $travis_end_time $duration
}

fold() {
local name="$1"
local status=0
shift 1
if [ -n "$TRAVIS" ]; then
printf "travis_fold:start:%s\r\e[0m" "$name"
travis_time_start
else
echo "============= Starting $name ==============="
fi
echo "============= Starting $name ==============="

"$@"
status=$?

[ -z "$TRAVIS" ] || travis_time_finish

if [ "$status" -eq 0 ]; then
if [ -n "$TRAVIS" ]; then
printf "travis_fold:end:%s\r\e[0m" "$name"
else
echo "============= Ending $name ==============="
fi
echo "============= Ending $name ==============="
else
STATUS="$status"
fi
Expand Down
6 changes: 3 additions & 3 deletions script/clone_all_rspec_repos
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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 All @@ -8,11 +8,11 @@ source script/functions.sh
if is_mri; then
pushd ..

clone_repo "rspec"
clone_repo "rspec-metagem" "rspec"
clone_repo "rspec-core"
clone_repo "rspec-expectations"
clone_repo "rspec-mocks"
clone_repo "rspec-rails" "6-1-maintenance"
clone_repo "rspec-rails" "rspec-rails" "6-1-maintenance"

if rspec_support_compatible; then
clone_repo "rspec-support"
Expand Down
2 changes: 1 addition & 1 deletion script/cucumber.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
13 changes: 9 additions & 4 deletions script/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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 )"
source $SCRIPT_DIR/ci_functions.sh
source $SCRIPT_DIR/predicate_functions.sh

# If JRUBY_OPTS isn't set, use these.
# see https://docs.travis-ci.com/user/ci-environment/
export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
SPECS_HAVE_RUN_FILE=specs.out
MAINTENANCE_BRANCH=`cat maintenance-branch`
Expand All @@ -20,12 +19,18 @@ fi
function clone_repo {
if [ ! -d $1 ]; then # don't clone if the dir is already there
if [ -z "$2" ]; then
DIR_TARGET="$1"
else
DIR_TARGET="$2"
fi

if [ -z "$3" ]; then
BRANCH_TO_CLONE="${MAINTENANCE_BRANCH?}";
else
BRANCH_TO_CLONE="$2";
BRANCH_TO_CLONE="$3";
fi;

ci_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?} ${DIR_TARGET?}"
fi;
}

Expand Down
2 changes: 1 addition & 1 deletion script/legacy_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
8 changes: 4 additions & 4 deletions script/update_rubygems_and_install_bundler
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#!/bin/bash
# This file was generated on 2023-12-25T16:05:21+00:00 from the rspec-dev repo.
# This file was generated on 2024-06-20T11:33:49+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
source script/functions.sh

if is_ruby_31_plus; then
echo "Installing rubygems 3.3.6 / bundler 2.3.6"
yes | gem update --system '3.3.6'
yes | gem install bundler -v '2.3.6'
echo "Installing most recent rubygems / bundler"
yes | gem update --no-document --system
yes | gem install --no-document bundler
elif is_ruby_23_plus; then
echo "Installing rubygems 3.2.22 / bundler 2.2.22"
yes | gem update --system '3.2.22'
Expand Down
Loading