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

Jump to bottom

use our own version of ember-cli so the test app is always generated with the latest blueprint #268

Merged
merged 2 commits into from
Mar 4, 2024
Merged

use our own version of ember-cli so the test app is always generated with the latest blueprint #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ee46f9
use our own version of ember-cli (i.e. latest)
mansona Mar 4, 2024
d99d907
remove global ember-cli in CI
mansona Mar 4, 2024
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
16 changes: 2 additions & 14 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,17 @@ jobs:
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- run: pnpm add --global ember-cli yarn
- run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
working-directory: tests


defaults_tests:
name: "ember-cli@${{ matrix.ember-cli }} : ${{ matrix.slow-test }}"
name: "Slow tests: ${{ matrix.slow-test }}"
timeout-minutes: 5
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ember-cli:
- 5.4.1
- 5.3.0

slow-test:
- defaults with npm
- defaults with yarn
Expand All @@ -122,22 +117,16 @@ jobs:
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- run: pnpm add --global ember-cli@${{ matrix.ember-cli }} yarn
- run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
working-directory: tests

typescript_tests:
name: "ember-cli@${{ matrix.ember-cli }} : ${{ matrix.slow-test }}"
name: "Slow tests: ${{ matrix.slow-test }}"
timeout-minutes: 5
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ember-cli:
- 5.4.1
Copy link
Collaborator

Choose a reason for hiding this comment

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

ah so this is our min ember-cli version for typescript

# Not testing against 5.3.0, because it has non-passing typechecking
# - 5.3.0

slow-test:
- typescript with npm
- typescript with yarn
Expand All @@ -153,6 +142,5 @@ jobs:
cache: pnpm
- name: Install Dependencies
run: pnpm install --frozen-lockfile
- run: pnpm add --global ember-cli@${{ matrix.ember-cli }} yarn
- run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
working-directory: tests
4 changes: 3 additions & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ const execa = require('execa');
const { merge } = require('lodash');
const { lt } = require('semver');

const Blueprint = require('ember-cli/lib/models/blueprint');

let date = new Date();

const { addonInfoFromOptions, testAppInfoFromOptions, withoutAddonOptions } = require('./src/info');
Expand Down Expand Up @@ -164,7 +166,7 @@ module.exports = {
`If you see this error, please open an issue at: https://github.com/embroider-build/addon-blueprint/issues`,
);

const appBlueprint = this.lookupBlueprint('app');
const appBlueprint = Blueprint.lookup('app');

if (!appBlueprint) {
throw new SilentError('Cannot find app blueprint for generating test-app!');
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"test": "pnpm --filter 'blueprint-tests' test"
},
"dependencies": {
"ember-cli": "^5.6.0",
"ember-cli-normalize-entity-name": "^1.0.0",
"ember-cli-string-utils": "^1.1.0",
"execa": "^5.1.1",
Expand Down
Loading