Skip to content

Commit a1d2941

Browse files
solnicsolnic
authored
Fix syntax in workflow files (#2507)
This fixes "unexpected end of the stream within a flow collection" error that we started seeing. Not sure what changed on GH though.
1 parent 315310f commit a1d2941

File tree

6 files changed

+115
-104
lines changed

6 files changed

+115
-104
lines changed

‎.github/workflows/sentry_delayed_job_test.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@ jobs:
3434
matrix:
3535
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
3636
include:
37-
- {
38-
ruby_version: "3.2",
39-
options:
40-
{
41-
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
42-
},
43-
}
44-
- { ruby_version: "3.2", options: { codecov: 1 } }
37+
- ruby_version: "3.2"
38+
options:
39+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal"
40+
- ruby_version: "3.2"
41+
options:
42+
codecov: 1
4543
exclude:
4644
# Because Rails 7.0 currently doesn't work with Ruby head
4745
# LoadError:

‎.github/workflows/sentry_opentelemetry_test.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,9 @@ jobs:
3636
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
3737
# opentelemetry_version: [1.2.0]
3838
include:
39-
- {
40-
ruby_version: 3.2,
41-
options:
42-
{
43-
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
44-
},
45-
}
39+
- ruby_version: 3.2
40+
options:
41+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal"
4642
exclude:
4743
- { ruby_version: 'jruby-head' }
4844
steps:

‎.github/workflows/sentry_rails_test.yml‎

Lines changed: 58 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,64 @@ jobs:
3030
rails_version: [6.1.0, 7.0.0, 7.1.0]
3131
ruby_version: [2.7, "3.0", "3.1", "3.2", "3.3"]
3232
include:
33-
- { ruby_version: "2.4", rails_version: 5.0.0 }
34-
- { ruby_version: "2.4", rails_version: 5.1.0 }
35-
- { ruby_version: "2.4", rails_version: 5.2.0 }
36-
- { ruby_version: "2.5", rails_version: 5.0.0 }
37-
- { ruby_version: "2.5", rails_version: 5.1.0 }
38-
- { ruby_version: "2.5", rails_version: 5.2.0 }
39-
- { ruby_version: "2.5", rails_version: 6.0.0 }
40-
- { ruby_version: "2.5", rails_version: 6.1.0 }
41-
- { ruby_version: "2.6", rails_version: 5.0.0 }
42-
- { ruby_version: "2.6", rails_version: 5.1.0 }
43-
- { ruby_version: "2.6", rails_version: 5.2.0 }
44-
- { ruby_version: "2.6", rails_version: 6.0.0 }
45-
- { ruby_version: "2.6", rails_version: 6.1.0 }
46-
- { ruby_version: "2.7", rails_version: 5.0.0 }
47-
- { ruby_version: "2.7", rails_version: 5.1.0 }
48-
- { ruby_version: "2.7", rails_version: 5.2.0 }
49-
- { ruby_version: "2.7", rails_version: 6.0.0 }
50-
- { ruby_version: "2.7", rails_version: 6.1.0 }
51-
- { ruby_version: "3.1", rails_version: 7.2.0 }
52-
- { ruby_version: "3.2", rails_version: 7.2.0 }
53-
- { ruby_version: "3.3", rails_version: 7.2.0 }
54-
- { ruby_version: "3.4", rails_version: 7.2.0 }
55-
- { ruby_version: "3.2", rails_version: "8.0.0" }
56-
- { ruby_version: "3.3", rails_version: "8.0.0" }
57-
- { ruby_version: "3.4", rails_version: "8.0.0" }
58-
- { ruby_version: "jruby", rails_version: 6.1.0 }
59-
- {
60-
ruby_version: "3.2",
61-
rails_version: 7.1.0,
62-
options:
63-
{
64-
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
65-
},
66-
}
67-
- {
68-
ruby_version: "3.2",
69-
rails_version: 7.1.0
70-
}
33+
- ruby_version: "2.4"
34+
rails_version: 5.0.0
35+
- ruby_version: "2.4"
36+
rails_version: 5.1.0
37+
- ruby_version: "2.4"
38+
rails_version: 5.2.0
39+
- ruby_version: "2.5"
40+
rails_version: 5.0.0
41+
- ruby_version: "2.5"
42+
rails_version: 5.1.0
43+
- ruby_version: "2.5"
44+
rails_version: 5.2.0
45+
- ruby_version: "2.5"
46+
rails_version: 6.0.0
47+
- ruby_version: "2.5"
48+
rails_version: 6.1.0
49+
- ruby_version: "2.6"
50+
rails_version: 5.0.0
51+
- ruby_version: "2.6"
52+
rails_version: 5.1.0
53+
- ruby_version: "2.6"
54+
rails_version: 5.2.0
55+
- ruby_version: "2.6"
56+
rails_version: 6.0.0
57+
- ruby_version: "2.6"
58+
rails_version: 6.1.0
59+
- ruby_version: "2.7"
60+
rails_version: 5.0.0
61+
- ruby_version: "2.7"
62+
rails_version: 5.1.0
63+
- ruby_version: "2.7"
64+
rails_version: 5.2.0
65+
- ruby_version: "2.7"
66+
rails_version: 6.0.0
67+
- ruby_version: "2.7"
68+
rails_version: 6.1.0
69+
- ruby_version: "3.1"
70+
rails_version: 7.2.0
71+
- ruby_version: "3.2"
72+
rails_version: 7.2.0
73+
- ruby_version: "3.3"
74+
rails_version: 7.2.0
75+
- ruby_version: "3.4"
76+
rails_version: 7.2.0
77+
- ruby_version: "3.2"
78+
rails_version: "8.0.0"
79+
- ruby_version: "3.3"
80+
rails_version: "8.0.0"
81+
- ruby_version: "3.4"
82+
rails_version: "8.0.0"
83+
- ruby_version: "jruby"
84+
rails_version: 6.1.0
85+
- ruby_version: "3.2"
86+
rails_version: 7.1.0
87+
options:
88+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal"
89+
- ruby_version: "3.2"
90+
rails_version: 7.1.0
7191
steps:
7292
- uses: actions/checkout@v4
7393
- name: Install sqlite and ImageMagick

‎.github/workflows/sentry_resque_test.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,9 @@ jobs:
3434
matrix:
3535
ruby_version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
3636
include:
37-
- {
38-
ruby_version: "3.2",
39-
options:
40-
{
41-
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
42-
},
43-
}
37+
- ruby_version: "3.2"
38+
options:
39+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal"
4440
exclude:
4541
- { ruby_version: 'jruby-head' }
4642
steps:

‎.github/workflows/sentry_ruby_test.yml‎

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,25 @@ jobs:
3939
rack_version: [2.0, 3.0, 3.1]
4040
redis_rb_version: [4.0]
4141
include:
42-
- { ruby_version: 3.2, rack_version: 0, redis_rb_version: 5.0 }
43-
- { ruby_version: 3.2, rack_version: 2.0, redis_rb_version: 5.0 }
44-
- {
45-
ruby_version: 3.2,
46-
rack_version: 3.0,
47-
redis_rb_version: 5.0,
48-
options:
49-
{
50-
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
51-
},
52-
}
53-
- {
54-
ruby_version: 3.2,
55-
rack_version: 3.0
56-
}
57-
- {
58-
ruby_version: 3.3,
59-
rack_version: 3.1,
60-
redis_rb_version: 5.3
61-
}
62-
- {
63-
ruby_version: 3.4,
64-
rack_version: 3.1,
65-
redis_rb_version: 5.3
66-
}
42+
- ruby_version: 3.2
43+
rack_version: 0
44+
redis_rb_version: 5.0
45+
- ruby_version: 3.2
46+
rack_version: 2.0
47+
redis_rb_version: 5.0
48+
- ruby_version: 3.2
49+
rack_version: 3.0
50+
redis_rb_version: 5.0
51+
options:
52+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal"
53+
- ruby_version: 3.2
54+
rack_version: 3.0
55+
- ruby_version: 3.3
56+
rack_version: 3.1
57+
redis_rb_version: 5.3
58+
- ruby_version: 3.4
59+
rack_version: 3.1
60+
redis_rb_version: 5.3
6761
exclude:
6862
- { ruby_version: 'jruby-head' }
6963
steps:

‎.github/workflows/sentry_sidekiq_test.yml‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,32 @@ jobs:
3030
sidekiq_version: ["5.0", "6.5", "7.0"]
3131
ruby_version: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4", jruby]
3232
include:
33-
- { ruby_version: 2.4, sidekiq_version: 5.0 }
34-
- { ruby_version: 2.5, sidekiq_version: 5.0 }
35-
- { ruby_version: 2.5, sidekiq_version: 6.0 }
36-
- { ruby_version: 2.6, sidekiq_version: 5.0 }
37-
- { ruby_version: 2.6, sidekiq_version: 6.0 }
38-
- { ruby_version: jruby, sidekiq_version: 5.0 }
39-
- { ruby_version: jruby, sidekiq_version: 6.0 }
40-
- { ruby_version: jruby, sidekiq_version: 7.0 }
41-
- {
42-
ruby_version: "3.2",
43-
sidekiq_version: 7.0,
44-
options:
45-
{
46-
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal",
47-
},
48-
}
49-
- { ruby_version: "3.2", sidekiq_version: 7.0 }
50-
- { ruby_version: "3.3", sidekiq_version: 7.0 }
51-
- { ruby_version: "3.4", sidekiq_version: 7.0 }
33+
- ruby_version: 2.4
34+
sidekiq_version: 5.0
35+
- ruby_version: 2.5
36+
sidekiq_version: 5.0
37+
- ruby_version: 2.5
38+
sidekiq_version: 6.0
39+
- ruby_version: 2.6
40+
sidekiq_version: 5.0
41+
- ruby_version: 2.6
42+
sidekiq_version: 6.0
43+
- ruby_version: jruby
44+
sidekiq_version: 5.0
45+
- ruby_version: jruby
46+
sidekiq_version: 6.0
47+
- ruby_version: jruby
48+
sidekiq_version: 7.0
49+
- ruby_version: "3.2"
50+
sidekiq_version: 7.0
51+
options:
52+
rubyopt: "--enable-frozen-string-literal --debug=frozen-string-literal"
53+
- ruby_version: "3.2"
54+
sidekiq_version: 7.0
55+
- ruby_version: "3.3"
56+
sidekiq_version: 7.0
57+
- ruby_version: "3.4"
58+
sidekiq_version: 7.0
5259
steps:
5360
- uses: actions/checkout@v4
5461

0 commit comments

Comments
 (0)