Skip to content

Commit

Permalink
Merge pull request #7 from rwjblue/fix-ci-config
Browse files Browse the repository at this point in the history
Use PnP aware Yarn in CI.
  • Loading branch information
stefanpenner committed Feb 27, 2019
2 parents 7c1340a + 9d94174 commit f28692e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -10,3 +10,8 @@ node_js:

cache:
yarn: true

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
- export PATH="$HOME/.yarn/bin:$PATH"
- yarn --version
1 change: 1 addition & 0 deletions appveyor.yml
Expand Up @@ -12,6 +12,7 @@ environment:

install:
- ps: Install-Product node $env:nodejs_version
- choco install yarn --version=1.13.0
- appveyor-retry yarn
- appveyor-retry yarn add mocha-appveyor-reporter # must be installed locally.

Expand Down
5 changes: 4 additions & 1 deletion tests/index-tests.js
Expand Up @@ -67,13 +67,16 @@ describe('resolve-package-path', function() {
app.pkg.private = true;
app.pkg.name
app.pkg.scripts = {
test: "node -e 'require(\"resolve-package-path\")(\"ember-source-channel-url\", __dirname)'"
test: "node -r ./.pnp.js ./test.js"
};
app.pkg.installConfig = {
pnp: true
};
app.addDependency('ember-source-channel-url', '1.1.0');
app.addDependency('resolve-package-path', 'link:' + path.join(__dirname, '..'));
app.files = {
'test.js': 'require("resolve-package-path")("ember-source-channel-url", __dirname)'
};
});

app.writeSync();
Expand Down

0 comments on commit f28692e

Please sign in to comment.