From 9134edd52b71a26cf3cad805c002723cf63a15c4 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Wed, 1 Nov 2023 15:40:18 -0400
Subject: [PATCH] Add Ember 4.12+ to CI

---
 .github/workflows/ci.yml |  4 +---
 README.md                |  2 +-
 config/ember-try.js      | 16 ++++++++++++++++
 package.json             |  1 +
 yarn.lock                |  7 +++++++
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2666a45..3d7e783 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -150,13 +150,11 @@ jobs:
             ember-lts-3.28,
             ember-lts-4.4,
             ember-lts-4.8,
+            ember-lts-4.12,
             ember-3.28-with-jquery,
             ember-3.28-classic,
           ]
         allow-failure: [false]
-        include:
-          - ember-try-scenario: ember-canary
-            allow-failure: true
 
     steps:
       - uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 8610975..f4844ac 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ addressing a single deprecation at a time, and prevents backsliding
 
 2.x
 
-- Ember.js 2.12 until at least 4.8
+- Ember.js 2.12 until at least 4.12
 - Ember CLI 3.16 or above
 - Node.js 12 and 14 or above
 
diff --git a/config/ember-try.js b/config/ember-try.js
index 5fb8fd3..303cfe9 100644
--- a/config/ember-try.js
+++ b/config/ember-try.js
@@ -78,6 +78,22 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-4.12',
+        npm: {
+          devDependencies: {
+            'ember-source': '~4.12.0',
+          },
+        },
+      },
+      {
+        name: 'ember-lts-5.3',
+        npm: {
+          devDependencies: {
+            'ember-source': '~5.3.0',
+          },
+        },
+      },
       {
         name: 'ember-release',
         npm: {
diff --git a/package.json b/package.json
index f52e7bc..1b4ff43 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
+    "@ember/string":"^3.0.0",
     "broccoli-funnel": "^3.0.3",
     "broccoli-merge-trees": "^4.2.0",
     "broccoli-plugin": "^4.0.5"
diff --git a/yarn.lock b/yarn.lock
index 197d37e..780d160 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1098,6 +1098,13 @@
     mkdirp "^1.0.4"
     silent-error "^1.1.1"
 
+"@ember/string@^3.0.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@ember/string/-/string-3.1.1.tgz#0a5ac0d1e4925259e41d5c8d55ef616117d47ff0"
+  integrity sha512-UbXJ+k3QOrYN4SRPHgXCqYIJ+yWWUg1+vr0H4DhdQPTy8LJfyqwZ2tc5uqpSSnEXE+/1KopHBE5J8GDagAg5cg==
+  dependencies:
+    ember-cli-babel "^7.26.6"
+
 "@ember/test-helpers@2.2.9":
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.2.9.tgz#68cceb50ad5b8adedad5d8bf73b39ff71a07f4a6"