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

Commit 824156d

Browse files
JonRoweJonRowe
authored
Merge pull request #2936 from rspec/update-ci-build-scripts-2022-01-30-for-main
Updates from rspec-dev (2022-01-30)
2 parents 63a85a0 + 28d2224 commit 824156d

11 files changed

+17
-12
lines changed

‎.github/workflows/ci.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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
1+
# This file was generated on 2022-01-30T10:38:31+00: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

‎.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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
1+
# This file was generated on 2022-01-30T10:38:31+00: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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
1+
# This file was generated on 2022-01-30T10:38:31+00: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:

‎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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
2+
# This file was generated on 2022-01-30T10:38:31+00: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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
2+
# This file was generated on 2022-01-30T10:38:31+00: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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
1+
# This file was generated on 2022-01-30T10:38:31+00: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 )"

‎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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
2+
# This file was generated on 2022-01-30T10:38:31+00: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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
1+
# This file was generated on 2022-01-30T10:38:31+00: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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
2+
# This file was generated on 2022-01-30T10:38:31+00: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/run_rubocop

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 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
2+
# This file was generated on 2022-01-30T10:38:31+00: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/update_rubygems_and_install_bundler

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#!/bin/bash
2-
# This file was generated on 2022-01-26T13:58:53+00:00 from the rspec-dev repo.
2+
# This file was generated on 2022-01-30T10:38:31+00: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
66
source script/functions.sh
77

8-
if is_ruby_23_plus; then
8+
if is_ruby_31_plus; then
9+
echo "Installing rubygems 3.3.6 / bundler 2.3.6"
10+
yes | gem update --system '3.3.6'
11+
yes | gem install bundler -v '2.3.6'
12+
elif is_ruby_23_plus; then
13+
echo "Installing rubygems 3.2.22 / bundler 2.2.22"
914
yes | gem update --system '3.2.22'
1015
yes | gem install bundler -v '2.2.22'
1116
else

0 commit comments

Comments
 (0)