Merge remote-tracking branch 'origin/stable' into merge-stable

# Conflicts: # .github/workflows/ci.yml # .release-plan.json
embroider-build · May 23, 2024 · 03e2839 · 03e2839
2 parents 3608a1f + e8a0dd0
commit 03e2839
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,9 +11,6 @@ on:
   push:
     branches:
       - main
-      - 'v[0-9]+*' # prior release branches (e.g. `v0.30.x` branch)
-    tags:
-      - 'v*'
   pull_request:
     branches: [main]
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Embroider Changelog
 
+## Release (2024-05-22)
+
+@embroider/addon-shim 1.8.9 (patch)
+
+#### :bug: Bug Fix
+* `@embroider/addon-shim`
+  * [#1940](https://github.com/embroider-build/embroider/pull/1940) only register v2 addons with parent addons ([@mansona](https://github.com/mansona))
+
+#### :house: Internal
+* [#1938](https://github.com/embroider-build/embroider/pull/1938) remove v* prefix GitHub Actions builds ([@mansona](https://github.com/mansona))
+
+#### Committers: 1
+- Chris Manson ([@mansona](https://github.com/mansona))
+
 ## Release (2024-05-08)
 
 @embroider/addon-shim 1.8.8 (patch)

diff --git a/packages/addon-shim/package.json b/packages/addon-shim/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@embroider/addon-shim",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "description": "Make v2 addons work in non-Embroider apps.",
   "keywords": [],
   "main": "./src/index.js",