Merge branch 'master' into require-newer-reline

ruby · Sep 21, 2023 · 823dcfc · 823dcfc
2 parents 06d597a + 5eba4e9
commit 823dcfc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/protocol.yml b/.github/workflows/protocol.yml
@@ -24,7 +24,7 @@ jobs:
         ruby-version: ['2.6', '2.7', '3.0', '3.1', 'head', 'debug']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

diff --git a/.github/workflows/ruby-macos.yaml b/.github/workflows/ruby-macos.yaml
@@ -24,7 +24,7 @@ jobs:
         ruby-version: ['3.2', 'head']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -24,7 +24,7 @@ jobs:
         ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2', 'head', 'debug']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

diff --git a/.github/workflows/test_test.yml b/.github/workflows/test_test.yml
@@ -24,7 +24,7 @@ jobs:
         ruby-version: ['3.0', '3.1', '3.2', 'head', 'debug']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Ruby
     # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
     # change this to (see https://github.com/ruby/setup-ruby#versioning):

diff --git a/test/console/backtrace_test.rb b/test/console/backtrace_test.rb
@@ -22,7 +22,7 @@ def program
     14|   end
     15| end
     16|
-    17| 3.times do
+    17| [1, 2, 3].each do
     18|   Foo.new.first_call
     19| end
       RUBY
@@ -33,7 +33,7 @@ def test_backtrace_prints_c_method_frame
         type 'b 18'
         type 'c'
         type 'bt'
-        assert_line_text(/\[C\] Integer#times/)
+        assert_line_text(/\[C\] Array#each/)
         type 'kill!'
       end
     end