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

Updating dev folder to help with debugging #3889

Merged
merged 1 commit into from
Apr 13, 2015
Merged

Updating dev folder to help with debugging #3889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM node:latest
FROM node:latest

RUN npm i -g npm
RUN npm i -g phantomjs

RUN apt-get update && apt-get install -y git

Expand Down
4 changes: 2 additions & 2 deletions dev/linux/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
1. Install Docker on [Windows](https://github.com/boot2docker/windows-installer/releases/latest) or [Mac](https://github.com/boot2docker/osx-installer/releases/latest)
1. Start Boot2Docker
1. `cd` into your cloned `ember-cli` folder
1. Run `cd dev/docker/linux`
1. Run `cd dev/linux`
1. Run `docker build -t ember-cli .`
1. Run `docker run -ti --rm=true ember-cli`
1. Run `cd ~/ember-cli`
1. Run `npm test`
1. Run `npm run-script test-all`
1. When you're done, run `exit`

##### Cleanup
Expand Down
2 changes: 1 addition & 1 deletion dev/windows/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
1. Wait for the command to finish
1. Open the command prompt in the Windows VM
1. Run `cd C:\Users\vagrant\ember-cli`
1. Run `npm test`
1. Run `npm run-script test-all`
1. When you're done, close the VM

##### Cleanup
Expand Down
6 changes: 4 additions & 2 deletions dev/windows/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
Set-ExecutionPolicy RemoteSigned -Scope Process -Force
iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))

cinst nodejs.install
cinst nodejs.install -y
$ENV:PATH += ";C:\Program Files\nodejs"
npm i -g npm
del "C:\Program Files\nodejs\npm*"
rd "C:\Program Files\nodejs\node_modules" -recurse
$ENV:PATH += ";C:\Users\vagrant\AppData\Roaming\npm"

cinst git.install
cinst git.install -y
$ENV:PATH += ";C:\Program Files (x86)\Git\cmd"

cinst phantomjs -y

cd C:\Users\vagrant
git clone https://github.com/ember-cli/ember-cli.git
cd ember-cli
Expand Down