Skip to content

Commit

Permalink
make readme more friendly and make sure we publish appium.io to gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
jlipps committed Apr 12, 2013
1 parent 2fd934e commit 22875ea
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
submodules/appium.io
submodules/ApiDemos
submodules/selendroid/selendroid-server/target
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Option 2: Run Appium from the command line using Node:

Example Tests: [Node.js](https://github.com/appium/appium/tree/master/sample-code/examples/node) | [Python](https://github.com/appium/appium/tree/master/sample-code/examples/python) | [PHP](https://github.com/appium/appium/tree/master/sample-code/examples/php) | [Ruby](https://github.com/appium/appium/tree/master/sample-code/examples/ruby) | [Java](https://github.com/appium/appium/tree/master/sample-code/examples/java)

More Detailed Information
Write Tests for Appium
-------------------
We support a sub-set of the [Selenium WebDriver JSON Wire Protocol](https://github.com/appium/appium/wiki/JSON-Wire-Protocol:-Supported-Methods).

Expand All @@ -84,7 +84,7 @@ We support Android and iOS platforms side-by-side:

- - -

Developing on Appium
Hacking with Appium
------------
Install [node.js](http://nodejs.org/) (includes npm, the node.js package manager).
The recommended way to install node is `brew install node`. Node [installed by
Expand All @@ -105,7 +105,7 @@ if you installed node.js via Homebrew). The third command installs all app
dependencies, builds supporting binaries and test apps. `reset.sh` is also the
recommended command to run after pulling changes from master.

Developing on Appium (iOS)
Hacking with Appium (iOS)
--------------

(First, have a look at [setting up your system for Appium iOS support](https://github.com/appium/appium/blob/master/docs/system-setup.md#ios).)
Expand All @@ -126,7 +126,7 @@ At this point, you can simply run:

./reset.sh --ios

Developing on Appium (Android)
Hacking with Appium (Android)
----------------

(First, have a look at [setting up your system for Appium Android support](https://github.com/appium/appium/blob/master/docs/system-setup.md#android).)
Expand Down
6 changes: 5 additions & 1 deletion grunt-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,11 @@ module.exports.generateAppiumIo = function(grunt, cb) {
grunt.log.write("Pushing changes to appium.io...");
var cmd = 'git commit -am "updating getting-started via grunt" && ' +
'git pull --rebase origin master && ' +
'git push origin master';
'git push origin master && ' +
'git checkout gh-pages && ' +
'git merge master && ' +
'git push origin gh-pages && ' +
'git checkout master';
exec(cmd, {cwd: submod}, function(err, stdout, stderr) {
if (err) {
console.log(stdout);
Expand Down
2 changes: 1 addition & 1 deletion submodules/appium.io

0 comments on commit 22875ea

Please sign in to comment.