Sitelet https://github.com/opal/opal/commit/cae78d92665ebaec6f8079775ade35e92d6910f8
Skip to content

Commit cae78d9

Browse files
committed
Rename Ruby jobs and sort
1 parent fc29aeb commit cae78d9

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ jobs:
4141
# - name: head-ruby
4242
# ruby: head
4343
# permissive: true
44-
- name: current-ruby
45-
ruby: '3.3'
46-
- name: previous-ruby
47-
ruby: '3.2'
48-
- name: older-ruby
49-
ruby: '3.1'
50-
- name: near-eol-ruby
44+
- name: ruby-3.0
5145
ruby: '3.0'
46+
- name: ruby-3.1
47+
ruby: '3.1'
48+
- name: ruby-3.2
49+
ruby: '3.2'
50+
- name: ruby-3.3
51+
ruby: '3.3'
52+
- name: ruby-3.4
53+
ruby: '3.4'
5254
- name: jruby
5355
ruby: 'jruby'
5456
# truffleruby: disabled, does not finish on github actions

‎spec/lib/compiler_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -650,9 +650,9 @@ def expect_magic_comments_for(*lines)
650650
end
651651

652652
expect(error.backtrace[0]).to eq("#{File.basename(__FILE__)}/foobar.js.rb:in `BEGIN {}'")
653-
expect(compiler_backtrace(error)[0]).to end_with(":in `error'")
654-
expect(compiler_backtrace(error)[-3]).to end_with(":in `block in compile'")
655-
expect(compiler_backtrace(error)[-1]).to end_with(":in `compile'")
653+
expect(compiler_backtrace(error)[0]).to match(/:in [`'](?:Opal::Compiler#)?error[`']$/)
654+
expect(compiler_backtrace(error)[-3]).to match(/:in [`']block in (?:Opal::Compiler#)?compile[`']$/)
655+
expect(compiler_backtrace(error)[-1]).to match(/:in [`'](?:Opal::Compiler#)?compile[`']$/)
656656
expect(error.backtrace.size).to be > 1
657657
end
658658
end
@@ -667,7 +667,7 @@ def expect_magic_comments_for(*lines)
667667
error = syntax_error
668668
end
669669
expect(error.backtrace[0]).to eq("#{File.basename(__FILE__)}/foobar.js.rb:1:in `def foo'")
670-
expect(compiler_backtrace(error)[0]).to end_with(":in `block in parse'")
670+
expect(compiler_backtrace(error)[0]).to match(/:in [`']block in (?:Opal::Compiler#)?parse[`']$/)
671671
expect(error.backtrace.size).to be > 1
672672

673673
expect($diagnostic_messages.flatten).to eq([

0 commit comments

Comments
 (0)