Skip to content

Commit 4f07f7c

Browse files
committed
Auto merge of #4237 - Turbo87:embroider, r=Turbo87
CI: Run tests for Embroider job again ... and enable two additional Embroider options see https://github.com/embroider-build/embroider#options
2 parents 5758ce3 + 3c4d364 commit 4f07f7c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ jobs:
6464

6565
- run: yarn install
6666

67-
# `yarn test` currently does not work due to https://github.com/embroider-build/embroider/issues/677
68-
- run: yarn build
67+
- run: yarn test
6968
continue-on-error: true
7069

7170
backend-lint:

ember-cli-build.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ module.exports = function (defaults) {
4747
if (USE_EMBROIDER) {
4848
const { Webpack } = require('@embroider/webpack');
4949
return require('@embroider/compat').compatBuild(app, Webpack, {
50+
staticAddonTestSupportTrees: true,
51+
staticModifiers: true,
52+
5053
// see https://github.com/embroider-build/embroider/issues/823
5154
compatAdapters: new Map([['ember-get-config', null]]),
5255
});

0 commit comments

Comments
 (0)