diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-19 09:12:32 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2014-02-19 09:12:32 -0800 |
| commit | 845e5d345890fabe97d3aa58cbf4e131c91e1559 (patch) | |
| tree | 1c0821547e7a393051a8818b1a57a76e3c2a2f43 /tools | |
| parent | ae0299287209e6d1dd0606c885ca087e82ed0e7d (diff) | |
| parent | 085db9dd6c1f3faf526c16170e9ffe89b8ec6211 (diff) | |
| download | node-new-845e5d345890fabe97d3aa58cbf4e131c91e1559.tar.gz | |
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
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/node-release-post-build.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/node-release-post-build.sh b/tools/node-release-post-build.sh index 6adda19f7d..4e3555c4f0 100755 --- a/tools/node-release-post-build.sh +++ b/tools/node-release-post-build.sh @@ -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 git@github.com:joyent/node $BRANCH + +echo "Now go do the website stuff" |