forked from nodejs/node
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/v0.10'
Conflicts: AUTHORS ChangeLog deps/uv/AUTHORS deps/uv/ChangeLog deps/uv/build.mk deps/uv/src/unix/linux-core.c deps/uv/src/unix/stream.c deps/uv/src/unix/sunos.c deps/uv/src/version.c src/node_version.h
- Loading branch information
Showing
8 changed files
with
80 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -514,7 +514,6 @@ Benjamin Waters <[email protected]> | |
Lev Gimelfarb <[email protected]> | ||
Peter Flannery <[email protected]> | ||
Tuğrul Topuz <[email protected]> | ||
ayanamist <[email protected]> | ||
Lorenz Leutgeb <[email protected]> | ||
Brandon Cheng <[email protected]> | ||
Alexis Campailla <[email protected]> | ||
|
@@ -524,3 +523,9 @@ Jo Liss <[email protected]> | |
Jun Ma <[email protected]> | ||
Jacob Hoffman-Andrews <[email protected]> | ||
Keith M Wesolowski <[email protected]> | ||
Maxime Quandalle <[email protected]> | ||
Doron Pagot <[email protected]> | ||
Kenan Sulayman <[email protected]> | ||
Christian Schulz <[email protected]> | ||
Pedro Ballesteros <[email protected]> | ||
Anton Khlynovskiy <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,12 @@ | |
|
||
set -e | ||
|
||
if [[ ! -e ../node-website/Makefile ]]; | ||
then | ||
echo "node-website must be checked out one level up" | ||
exit 1 | ||
fi | ||
|
||
stability="$(python tools/getstability.py)" | ||
NODE_STABC="$(tr '[:lower:]' '[:upper:]' <<< ${stability:0:1})${stability:1}" | ||
NODE_STABL="$stability" | ||
|
@@ -43,15 +49,16 @@ make email.md | |
echo "title: Node v"$(python tools/getnodeversion.py)" ($NODE_STABC)" | ||
echo "slug: node-v"$(python tools/getnodeversion.py | sed 's|\.|-|g')"-$NODE_STABL" | ||
echo "" | ||
cat email.md ) > doc/blog/release/v$(python tools/getnodeversion.py).md | ||
cat email.md ) > ../node-website/doc/blog/release/v$(python tools/getnodeversion.py).md | ||
|
||
if [ "$stability" = "stable" ]; | ||
then | ||
## this needs to happen here because the website depends on the current node | ||
## node version | ||
## this will get the api docs in the right place | ||
make website-upload | ||
make blog-upload | ||
BRANCH="v$(python tools/getnodeversion.py | sed -E 's#\.[0-9]+$##')" | ||
echo $(python tools/getnodeversion.py) > ../node-website/STABLE | ||
else | ||
BRANCH="master" | ||
fi | ||
|
@@ -67,13 +74,6 @@ git merge --no-ff v$(python tools/getnodeversion.py)-release | |
vim src/node_version.h | ||
git commit -am "Now working on "$(python tools/getnodeversion.py) | ||
|
||
if [ "$stability" = "stable" ]; | ||
then | ||
echo "Adding blog" | ||
git add doc/blog | ||
git commit -m "blog: Post for v$(python tools/getprevnodeversion.py)" | ||
else | ||
echo "copy blog to stable branch" | ||
fi | ||
|
||
git push [email protected]:joyent/node $BRANCH | ||
|
||
echo "Now go do the website stuff" |