From ce1291fd53e2e435684492be3b66d0b9bf884969 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Fri, 23 Feb 2024 10:10:03 +0000 Subject: [PATCH 1/2] Update Gemfile to point to metagem repo --- Gemfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2412ed245..8acce49c0 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,11 @@ branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp if File.exist?(library_path) && !ENV['USE_GIT_REPOS'] gem lib, :path => library_path else - gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch + if lib == 'rspec' + gem 'rspec', :git => "https://github.com/rspec/rspec-metagem.git", :branch => branch + else + gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => branch + end end end From 77d8280fc684ec237de9ed226d97206aa24e8d7a Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Fri, 23 Feb 2024 09:58:19 +0000 Subject: [PATCH 2/2] Updated ci build scripts (from rspec-dev) main --- .github/dependabot.yml | 2 +- .github/workflows/ci.yml | 2 +- .rubocop_rspec_base.yml | 2 +- script/ci_functions.sh | 30 +++------------------- script/clone_all_rspec_repos | 4 +-- script/cucumber.sh | 2 +- script/functions.sh | 13 +++++++--- script/legacy_setup.sh | 2 +- script/predicate_functions.sh | 2 +- script/run_build | 2 +- script/run_rubocop | 2 +- script/update_rubygems_and_install_bundler | 8 +++--- 12 files changed, 26 insertions(+), 45 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f0eb3c62f..81efa1dfb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d1af5e73..d472fddcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/.rubocop_rspec_base.yml b/.rubocop_rspec_base.yml index 8f1edba0e..83f37f2af 100644 --- a/.rubocop_rspec_base.yml +++ b/.rubocop_rspec_base.yml @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/script/ci_functions.sh b/script/ci_functions.sh index f5357afa6..6dd3fd72f 100644 --- a/script/ci_functions.sh +++ b/script/ci_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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: @@ -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 diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos index 1f93877e4..7825e6a8e 100755 --- a/script/clone_all_rspec_repos +++ b/script/clone_all_rspec_repos @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 @@ -8,7 +8,7 @@ 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" diff --git a/script/cucumber.sh b/script/cucumber.sh index a9c33125e..c6380e58c 100755 --- a/script/cucumber.sh +++ b/script/cucumber.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/script/functions.sh b/script/functions.sh index a6129bfc0..c224e9ce3 100644 --- a/script/functions.sh +++ b/script/functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 )" @@ -6,7 +6,6 @@ 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` @@ -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; } diff --git a/script/legacy_setup.sh b/script/legacy_setup.sh index 051f2f8cd..832e36593 100755 --- a/script/legacy_setup.sh +++ b/script/legacy_setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh index c272700f6..6cf0aefd3 100644 --- a/script/predicate_functions.sh +++ b/script/predicate_functions.sh @@ -1,4 +1,4 @@ -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 { diff --git a/script/run_build b/script/run_build index 5d661daeb..9d00141b0 100755 --- a/script/run_build +++ b/script/run_build @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/script/run_rubocop b/script/run_rubocop index 972bcd4b3..df44d911b 100755 --- a/script/run_rubocop +++ b/script/run_rubocop @@ -1,5 +1,5 @@ #!/bin/bash -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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 diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler index 9ed373e55..1983cb478 100755 --- a/script/update_rubygems_and_install_bundler +++ b/script/update_rubygems_and_install_bundler @@ -1,14 +1,14 @@ #!/bin/bash -# This file was generated on 2023-12-25T16:07:49+00:00 from the rspec-dev repo. +# This file was generated on 2024-02-23T14:21:35+00: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'