From 4509684addd24810698b49f446dc484a30855552 Mon Sep 17 00:00:00 2001
From: Luan Nico <luanpotter27@gmail.com>
Date: Sun, 19 Apr 2026 11:02:14 -0400
Subject: [PATCH 1/2] Revert "chore: Remove unnecessary CI steps (#3738)"

This reverts commit 5514534de361bcc765a202859360b1eeb47f4227.
---
 .github/workflows/cicd.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index 7d728c70aee..bb23f013794 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -7,11 +7,20 @@ on:
   pull_request:
     types: [opened, reopened, synchronize]
 
+
 env:
   FLUTTER_MIN_VERSION: '3.41.0'
 
 jobs:
   # BEGIN LINTING STAGE
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+      - uses: bluefireteam/melos-action@v3
+      - run: melos run format-check
+
   analyze:
     runs-on: ubuntu-latest
     steps:
@@ -25,6 +34,17 @@ jobs:
         with:
           fatal-infos: true
 
+  analyze-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+      - uses: bluefireteam/melos-action@v3
+      - name: "Analyze with latest stable"
+        uses: invertase/github-action-dart-analyzer@v3
+        with:
+          fatal-infos: true
+
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
@@ -49,3 +69,16 @@ jobs:
       - name: Run DCM
         run: dcm analyze .
   # END LINTING STAGE
+
+  # BEGIN TESTING STAGE
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: subosito/flutter-action@v2
+        with:
+          cache: true
+      - uses: bluefireteam/melos-action@v3
+      - name: Run tests
+        run: melos test
+  # END TESTING STAGE

From db0b9cb17b6ce93baaf10045a2e2ac3f3e4c9744 Mon Sep 17 00:00:00 2001
From: Luan Nico <luanpotter27@gmail.com>
Date: Sun, 19 Apr 2026 11:02:18 -0400
Subject: [PATCH 2/2] Revert "docs: Add Shorebird CI status badge to
 `README.md` (#3735)"

This reverts commit 9d082abcfee3db5e81f96e3e4f530cdbd320f97d.
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 1f5a5816f47..4545e8ddd60 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,6 @@ A Flutter-based game engine.
 
 <p align="center">
   <a title="Pub" href="https://pub.dev/packages/flame"><img src="https://img.shields.io/pub/v/flame.svg?style=popout"/></a>
-  <a title="Shorebird CI" href="https://console.shorebird.dev/ci"><img src="https://api.shorebird.dev/api/v1/github/flame-engine/flame/badge.svg"/></a>
   <a title="Test" href="https://github.com/flame-engine/flame/actions?query=workflow%3Acicd+branch%3Amain"><img src="https://github.com/flame-engine/flame/actions/workflows/cicd.yml/badge.svg?branch=main&event=push"/></a>
   <a title="Discord" href="https://discord.gg/pxrBmy4"><img src="https://img.shields.io/discord/509714518008528896.svg"/></a>
   <a title="Melos" href="https://github.com/invertase/melos"><img src="https://img.shields.io/badge/maintained%20with-melos-f700ff.svg"/></a>