From 1f5bcc1247e9c38eb1d7785f84c66af3d52b6ea4 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Wed, 15 Feb 2023 23:34:22 +0900 Subject: [PATCH 1/3] Add Ruby 3.2 to CI matrix --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f72ddd3..5ce9158 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,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: From e3200f5267cdc569d2884780e3149bc069548123 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Wed, 15 Feb 2023 23:38:21 +0900 Subject: [PATCH 2/3] Back CI on master push CI against master branch was lost in https://github.com/seanpdoyle/ember-cli-rails-assets/pull/18. --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ce9158..8848cb1 100644 --- 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: From bd9adba0bbae14b2e950765dbf9df9401402f0d0 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Thu, 16 Feb 2023 00:00:37 +0900 Subject: [PATCH 3/3] Fix specs for Ruby 3.2 Since `Object#=~` has been removed in Ruby 3.2, the following code raises NoMethodError when `asset` provided as `Hash`. https://github.com/seanpdoyle/ember-cli-rails-assets/blob/v0.7.0/lib/ember_cli/assets/asset_map.rb#L36 Ref: https://bugs.ruby-lang.org/issues/15231 This spec should be updated with empty value as `nil` due to type consistency. --- spec/lib/ember_cli/assets/asset_map_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/lib/ember_cli/assets/asset_map_spec.rb b/spec/lib/ember_cli/assets/asset_map_spec.rb index aa42f4f..b9234c7 100644 --- 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", },