diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5332f7a19..50459df28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ jobs: strategy: matrix: os: - - ubuntu-latest - - macos-latest + # - ubuntu-latest + # - macos-latest - windows-latest node: - 8 @@ -33,17 +33,17 @@ jobs: test-command: - test:fast - test:slow - exclude: - - os: macos-latest - node: 13 - - os: macos-latest - node: 8 - test-command: test:fast - - os: windows-latest - node: 13 - - os: windows-latest - node: 8 - test-command: test:fast + # exclude: + # - os: macos-latest + # node: 13 + # - os: macos-latest + # node: 8 + # test-command: test:fast + # - os: windows-latest + # node: 13 + # - os: windows-latest + # node: 8 + # test-command: test:fast runs-on: ${{ matrix.os }} @@ -58,6 +58,7 @@ jobs: - run: npm ci - run: npm run ${{ matrix.test-command }} + shell: bash timeout-minutes: 15 env: NODE_LTS: ${{ matrix.node == 8 }} diff --git a/test/acceptance/ember-cli-update-test.js b/test/acceptance/ember-cli-update-test.js index 41c0a3547..67bff6db3 100644 --- a/test/acceptance/ember-cli-update-test.js +++ b/test/acceptance/ember-cli-update-test.js @@ -214,10 +214,9 @@ describe(function() { }); }); - it('scopes to sub dir if run from there', async function() { - let { - status - } = await (await merge({ + // eslint-disable-next-line mocha/no-exclusive-tests + it.only('scopes to sub dir if run from there', async function() { + let result = await (await merge({ fixturesPath: 'test/fixtures/app/local', commitMessage: 'my-app', subDir: 'foo/bar' @@ -227,8 +226,8 @@ describe(function() { mergeFixtures: 'test/fixtures/app/merge/my-app' }); - assertNormalUpdate(status); - assertNoUnstaged(status); + assertNormalUpdate(result.status); + assertNoUnstaged(result.status); }); it('can pick from multiple blueprints', async function() {