Merge pull request #20 from tricknotes/update-ci

Test on Ruby 3.2 and run CI on master branch
tricknotes · Nov 2, 2024 · 0bc38b8 · 0bc38b8
2 parents 6e67957 + bd9adba
commit 0bc38b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,7 +1,10 @@
 name: "CI"
 
 on:
-  - pull_request
+  push:
+    branches:
+      - "master"
+  pull_request:
 
 jobs:
   build:
@@ -10,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["2.7", "3.0", "3.1"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
         rails: ["6.1", "7.0"]
 
     env:

diff --git a/spec/lib/ember_cli/assets/asset_map_spec.rb b/spec/lib/ember_cli/assets/asset_map_spec.rb
@@ -5,7 +5,7 @@
     it "includes the most recent javascript build artifacts" do
       asset_map = {
         "assets" => {
-          "not-a-match" => {},
+          "not-a-match" => nil,
           "bar.js" => "bar-abc123.js",
           "vendor.js" => "vendor-abc123.js",
         },
@@ -42,7 +42,7 @@
     it "includes the most recent stylesheet build artifacts" do
       asset_map = {
         "assets" => {
-          "not-a-match" => {},
+          "not-a-match" => nil,
           "bar.css" => "bar-abc123.css",
           "vendor.css" => "vendor-abc123.css",
         },