Skip to content

Commit 9cb87fa

Browse files
committed
Try old behaviour
1 parent 08c8312 commit 9cb87fa

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

script/bundle

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ source $SCRIPT_DIR/functions.sh
77
echo "Set bundle path to .bundle/gems"
88
bundle config set --local path '.bundle/gems'
99

10-
# We don't run standalone because rails will break
10+
if is_ruby_3_2_plus; then
11+
# We don't run standalone because rails will break
1112

12-
echo "bundle install"
13-
bundle install
13+
echo "bundle install"
14+
bundle install
1415

15-
echo "bundle binstubs --all"
16-
bundle binstubs --all
16+
echo "bundle binstubs --all"
17+
bundle binstubs --all
18+
else
19+
# bundle install --standalone
20+
# bundle binstubs --all
21+
bundle install --binstubs
22+
fi;

script/functions.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
22
SPECS_HAVE_RUN_FILE=specs.out
33
MAINTENANCE_BRANCH=`cat maintenance-branch`
44

5+
function is_ruby_3_2_plus {
6+
if ruby -e "exit(RUBY_VERSION.to_f >= 3.2)"; then
7+
return 0
8+
else
9+
return 1
10+
fi
11+
}
12+
513
ci_retry() {
614
local result=0
715
local count=1

script/update_rubygems_and_install_bundler

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,7 @@
22
# This file is manually managed unlike the rest of core rspec gems because it is independent.
33

44
set -e
5-
6-
function is_ruby_3_2_plus {
7-
if ruby -e "exit(RUBY_VERSION.to_f >= 3.2)"; then
8-
return 0
9-
else
10-
return 1
11-
fi
12-
}
13-
5+
source script/functions.sh
146

157
if is_ruby_3_2_plus; then
168
gem update --no-document --system

0 commit comments

Comments
 (0)