Skip to content

CI updates #1434

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.

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

Merged
merged 3 commits into from
Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
runs-on: ubuntu-latest
needs: [test-locked-deps]
strategy:
fail-fast: false
matrix:
deps:
- ember-cli@latest
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"postpublish": "rimraf js"
},
"dependencies": {
"ansi-to-html": "^0.6.6",
"ansi-to-html": "^0.6.15",
"broccoli-stew": "^3.0.0",
"debug": "^4.0.0",
"execa": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion ts/lib/commands/precompile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default command({
// Capture a string with stdout and stderr interleaved for error reporting
all: true,
});
} catch (e) {
} catch (e: any) {
fs.removeSync(outDir);
console.error(`\n${e.all}\n`);
throw e;
Expand Down
2 changes: 1 addition & 1 deletion ts/tests/acceptance/build-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe('Acceptance: build', function () {
try {
await app.build();
expect.fail('Build should have failed');
} catch (error) {
} catch (error: any) {
expect(error.all).to.include(`Cannot find module 'nonexistent'`);
}
});
Expand Down
4 changes: 2 additions & 2 deletions ts/tests/helpers/skeleton-app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const getEmberPort = (() => {

interface EmberCliOptions {
args?: string[];
env?: Record<string, string>;
env?: Record<string, string> | undefined;
}

export default class SkeletonApp {
Expand Down Expand Up @@ -77,7 +77,7 @@ export default class SkeletonApp {
process.off('beforeExit', this.cleanupTempDir);
}

_ember({ args, env }: EmberCliOptions) {
_ember({ args, env = {} }: EmberCliOptions) {
let ember = require.resolve('ember-cli/bin/ember');
return execa.node(ember, args, { cwd: this.root, all: true, env });
}
Expand Down
5 changes: 0 additions & 5 deletions ts/types/ansi-to-html/index.d.ts

This file was deleted.

12 changes: 12 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1808,6 +1808,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
"@types/color-name" "^1.1.1"
color-convert "^2.0.1"

ansi-to-html@^0.6.15:
version "0.6.15"
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
dependencies:
entities "^2.0.0"

ansi-to-html@^0.6.6:
version "0.6.14"
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.14.tgz#65fe6d08bba5dd9db33f44a20aec331e0010dad8"
Expand Down Expand Up @@ -5419,6 +5426,11 @@ entities@^1.1.2, entities@~1.1.1:
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==

entities@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==

entities@~2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz#5c487e5742ab93c15abb5da22759b8590ec03b7f"
Expand Down