Skip to content

Prepare Beta 6.6.0#10728

Merged
mansona merged 63 commits intobetafrom
merge-release
Jun 16, 2025
Merged

Prepare Beta 6.6.0#10728
mansona merged 63 commits intobetafrom
merge-release

Conversation

@mansona
Copy link
Member

@mansona mansona commented Jun 16, 2025

This PR:

  • merges from origin/release into beta to get updates from the last release
  • merges from origin/master into beta to "promote" the last alpha to a new beta
  • updates blueprint dependencies to beta

kellyselden and others added 30 commits May 2, 2025 07:34
[Bugfix]: Update ember-data and unify the versions between @ and non-@
Update fixtures

Update index.js
Start using release-plan for releasing ember-cli
make sure we release alpha with release-plan
Prepare Alpha Release v6.6.0-alpha.1
fix yuidoc generation on publish
mansona and others added 15 commits June 12, 2025 14:54
[Backport release]: start using release-plan to release ember-cli
prevent clashes between release-plan branches
use patched github-changelog for properly rolling up beta changelog
# Conflicts:
#	.github/workflows/plan-release.yml
#	.github/workflows/publish.yml
#	.release-plan.json
#	CHANGELOG.md
#	RELEASE.md
#	blueprints/app/files/package.json
#	package.json
#	pnpm-lock.yaml
#	tests/fixtures/app/defaults/package.json
#	tests/fixtures/app/embroider-no-welcome/package.json
#	tests/fixtures/app/embroider-pnpm/package.json
#	tests/fixtures/app/embroider-yarn/package.json
#	tests/fixtures/app/embroider/package.json
#	tests/fixtures/app/npm/package.json
#	tests/fixtures/app/pnpm/package.json
#	tests/fixtures/app/typescript-embroider/package.json
#	tests/fixtures/app/typescript/package.json
#	tests/fixtures/app/yarn/package.json
@mansona mansona changed the title Merge release Merge origin/release into origin/beta Jun 16, 2025
"@ember-data/request-utils": "~5.5.0",
"@ember-data/serializer": "~5.5.0",
"@ember-data/store": "~5.5.0",
"@warp-drive/ember": "~5.5.0<% } %>",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be updated to match the version of ember-data?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mansona This is the only comment I have that stands

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

turns out the dependency script wasn't aware of @ember-data/* or @warp-drive/* packages 🙈 I've updated it and run the updated script on this branch too 👍

@mansona mansona changed the title Merge origin/release into origin/beta Prepare Beta 6.6.0 Jun 16, 2025
@mansona mansona merged commit bf84908 into beta Jun 16, 2025
136 of 138 checks passed
@mansona mansona deleted the merge-release branch June 16, 2025 18:44
@mansona mansona added the ignore label Jul 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants