Skip to content

Commit

Permalink
other thing...
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo committed Apr 3, 2018
1 parent 208c11b commit ac0b33f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
5 changes: 2 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ install:
- ps: wget https://storage.googleapis.com/dart-archive/channels/dev/release/latest/sdk/dartsdk-windows-x64-release.zip -OutFile dart-sdk.zip
- cmd: echo "Unzipping dart-sdk..."
- cmd: 7z x dart-sdk.zip -o"C:\tools" -y > nul
- set PATH=%PATH%;C:\tools\dart-sdk\bin
- set PATH=%PATH%;%APPDATA%\Pub\Cache\bin
- cd webdev
- pub get && exit 0
- C:\tools\dart-sdk\bin\pub.bat get && exit 0

build: off

test_script:
- pub run test -j 1
- C:\tools\dart-sdk\bin\pub.bat run test -j 1

cache:
- C:\Users\appveyor\AppData\Roaming\Pub\Cache
2 changes: 1 addition & 1 deletion webdev/lib/src/pubspec.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class PackageExceptionDetails {
}

Future _runPubDeps() async {
var result = Process.runSync('pub', ['deps'], runInShell: true);
var result = Process.runSync(pubPath, ['deps']);

if (result.exitCode == 65 || result.exitCode == 66) {
throw new PackageException._(
Expand Down
3 changes: 2 additions & 1 deletion webdev/lib/src/util.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ final String _sdkDir = (() {
return aboveExecutable;
})();

final String dartPath = p.join(_sdkDir, 'bin', 'dart');
final String dartPath =
p.join(_sdkDir, 'bin', Platform.isWindows ? 'dart.exe' : 'dart');
final String pubPath =
p.join(_sdkDir, 'bin', Platform.isWindows ? 'pub.bat' : 'pub');
4 changes: 1 addition & 3 deletions webdev/test/integration_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,7 @@ dependencies:
test('should succeed with valid configuration', () async {
var exampleDirectory = p.absolute(p.join(p.current, '..', 'example'));
var process = await TestProcess.start(pubPath, ['get'],
workingDirectory: exampleDirectory,
environment: _getPubEnvironment(),
runInShell: true);
workingDirectory: exampleDirectory, environment: _getPubEnvironment());

await process.shouldExit(0);

Expand Down

0 comments on commit ac0b33f

Please sign in to comment.