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

Commit 762aafb

Browse files
JonRoweJonRowe
authored
Merge pull request #1582 from rspec/update-ci-build-scripts-2024-07-15-for-main
Updates from rspec-dev (2024-07-15)
2 parents fe4d292 + 1775715 commit 762aafb

12 files changed

+19
-12
lines changed

‎.github/dependabot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
1+
# This file was generated on 2024-07-15T21:58:52+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
1+
# This file was generated on 2024-07-15T21:58:52+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

‎.rubocop_rspec_base.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
1+
# This file was generated on 2024-07-15T21:58:52+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
1+
# This file was generated on 2024-07-15T21:58:52+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:

‎script/clone_all_rspec_repos

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
2+
# This file was generated on 2024-07-15T21:58:52+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
2+
# This file was generated on 2024-07-15T21:58:52+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

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
1+
# This file was generated on 2024-07-15T21:58:52+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 )"
@@ -68,6 +68,13 @@ function run_cukes {
6868
RUBYOPT="-I${PWD}/../bundle -rbundler/setup" \
6969
PATH="${PWD}/bin:$PATH" \
7070
bin/cucumber --strict
71+
elif is_ruby_head; then
72+
# This is a monkey patch to fix an issue with cucumber using outdated hash syntax, remove when cucumber is updated or ruby 3.4 released
73+
sed -i '$i\class Hash; alias :__initialize :initialize; def initialize(*args, **_kw, &block) = __initialize(*args, &block); end' bin/cucumber
74+
75+
RUBYOPT="${RUBYOPT} -I${PWD}/../bundle -rbundler/setup" \
76+
PATH="${PWD}/bin:$PATH" \
77+
bin/cucumber --strict
7178
else
7279
# Prepare RUBYOPT for scenarios that are shelling out to ruby,
7380
# and PATH for those that are using `rspec` or `rake`.

‎script/legacy_setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
2+
# This file was generated on 2024-07-15T21:58:52+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
1+
# This file was generated on 2024-07-15T21:58:52+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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
2+
# This file was generated on 2024-07-15T21:58:52+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/run_rubocop

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
2+
# This file was generated on 2024-07-15T21:58:52+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/update_rubygems_and_install_bundler

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# This file was generated on 2024-07-09T08:51:39+02:00 from the rspec-dev repo.
2+
# This file was generated on 2024-07-15T21:58:52+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)