Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Add embroider-safe scenario #1157

Merged
merged 11 commits into from
Jan 8, 2025
Merged

[CI] Add embroider-safe scenario #1157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
31ceef5
empty
bantic Jan 8, 2025
ec67d0f
add embroider-safe, embroider-optimized ember-try scenarios
bantic Jan 8, 2025
3e5a328
deduplicate yarn
bantic Jan 8, 2025
d35db61
add resolution for @ember/test-waiters because 3.0.1 (reqd by ember-a…
bantic Jan 8, 2025
4a5700c
yarn deduplicate
bantic Jan 8, 2025
6eabb53
add @ember/string
bantic Jan 8, 2025
38f9ad8
add @ember/string v3
bantic Jan 8, 2025
f3259bf
remove embroider pkgs from package.json
bantic Jan 8, 2025
1c9720c
workflow: set fail-fast to false to allow all ember-try to complete
bantic Jan 8, 2025
d6c63f7
drop embroider-optimized from ember-try scenarios
bantic Jan 8, 2025
067ee02
downgrade glimmer/component to v1
bantic Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ jobs:
timeout-minutes: 10

strategy:
fail-fast: false
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Semi unrelated. This allows all ember-try scenarios to run to completion.

matrix:
ember-version:
[
embroider-safe,
# embroider-optimized,
ember-lts-3.12,
ember-lts-3.20,
ember-lts-3.24,
Expand Down
3 changes: 3 additions & 0 deletions config/ember-try.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* eslint-env node */
const getChannelURL = require('ember-source-channel-url');
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');

module.exports = function() {
return Promise.all([
Expand All @@ -10,6 +11,8 @@ module.exports = function() {
return {
useYarn: true,
scenarios: [
embroiderSafe(),
embroiderOptimized(),
{
name: 'ember-lts-3.12',
npm: {
Expand Down
3 changes: 2 additions & 1 deletion ember-cli-build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ module.exports = function(defaults) {
behave. You most likely want to be modifying `./index.js` or app's build file
*/

return app.toTree();
let { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app);
};
6 changes: 5 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,15 @@
"@addepar/sass-lint-config": "^2.0.1",
"@addepar/style-toolbox": "~0.8.1",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.0",
"@ember/test-helpers": "^2.8.1",
"@embroider/test-setup": "^4.0.0",
"@glimmer/component": "^1.1.2",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

embroider complains if this isn't present because the dummy app imports from it here:

ember-table/tests/dummy/app/components/examples/aborting-a-selection/component.js

Line 1 in 3bb0896

import Component from '@glimmer/component';

"@tsconfig/ember": "^1.0.1",
"@types/ember__component": "^4.0.10",
"babel-eslint": "^10.0.1",
"broccoli-asset-rev": "^3.0.0",
"ember-a11y-testing": "^5.0.0",
"ember-a11y-testing": "^5.2.1",
"ember-auto-import": "^2.4.2",
"ember-cli": "~3.28.0",
"ember-cli-dependency-checker": "^3.2.0",
Expand Down Expand Up @@ -100,6 +103,7 @@
},
"homepage": "https://Addepar.github.io/ember-table",
"resolutions": {
"@ember/test-waiters": "^3.0.2",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

ember/test-waiters at 3.0.1 is not compatible with embroider. We fix this using a resolution because it's a secondary dependency of ember-a11y-testing, and bumping ember-a11y-testing to the ^5.2.1 range did not pick up the newer ember/test-waiters.
In a follow-up I'll attempt to upgrade ember-a11y-testing, at which point we can probably remove this.

"prettier": "1.18.2"
},
"typesVersions": {
Expand Down
Loading
Loading