From 1fcb92726d7b2b867dba90940d9a38f3043a5fe7 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 17 May 2023 20:23:36 -0400
Subject: [PATCH 1/2] Make preflight error when suite-setup-util fails

---
 .github/workflows/ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2301db316..b89f05e4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,9 @@ jobs:
         run: pnpm lint
       - id: set-matrix
         working-directory: test-packages/support
-        run: echo "matrix=$(node ./suite-setup-util.js --matrix)" >> $GITHUB_OUTPUT
+        run: |
+          matrix_json=$(node ./suite-setup-util --matrix)
+          echo "matrix=$matrix_json" >> $GITHUB_OUTPUT
 
   test:
     needs: ['preflight']

From 82d20d1647ca2ed37b04fc60b00367af779f00ee Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 17 May 2023 20:33:27 -0400
Subject: [PATCH 2/2] use correct name for skipping engine scenarios

---
 tests/scenarios/engines-test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/scenarios/engines-test.ts b/tests/scenarios/engines-test.ts
index 09149e95f..948cfa2a5 100644
--- a/tests/scenarios/engines-test.ts
+++ b/tests/scenarios/engines-test.ts
@@ -117,7 +117,7 @@ engineScenarios
   });
 
 engineScenarios
-  .skip('release') // fails due to https://github.com/emberjs/ember.js/pull/20461
+  .skip('release-engines') // fails due to https://github.com/emberjs/ember.js/pull/20461
   .map('with-fastboot', app => {
     app.linkDependency('ember-cli-fastboot', { baseDir: __dirname });
     app.linkDependency('fastboot', { baseDir: __dirname });