Skip to content

Commit 0bc38b8

Browse files
authored
Merge pull request #20 from tricknotes/update-ci
Test on Ruby 3.2 and run CI on master branch
2 parents 6e67957 + bd9adba commit 0bc38b8

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
name: "CI"
22

33
on:
4-
- pull_request
4+
push:
5+
branches:
6+
- "master"
7+
pull_request:
58

69
jobs:
710
build:
@@ -10,7 +13,7 @@ jobs:
1013
strategy:
1114
fail-fast: false
1215
matrix:
13-
ruby: ["2.7", "3.0", "3.1"]
16+
ruby: ["2.7", "3.0", "3.1", "3.2"]
1417
rails: ["6.1", "7.0"]
1518

1619
env:

spec/lib/ember_cli/assets/asset_map_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
it "includes the most recent javascript build artifacts" do
66
asset_map = {
77
"assets" => {
8-
"not-a-match" => {},
8+
"not-a-match" => nil,
99
"bar.js" => "bar-abc123.js",
1010
"vendor.js" => "vendor-abc123.js",
1111
},
@@ -42,7 +42,7 @@
4242
it "includes the most recent stylesheet build artifacts" do
4343
asset_map = {
4444
"assets" => {
45-
"not-a-match" => {},
45+
"not-a-match" => nil,
4646
"bar.css" => "bar-abc123.css",
4747
"vendor.css" => "vendor-abc123.css",
4848
},

0 commit comments

Comments
 (0)