diff --git a/.travis.yml b/.travis.yml index 672dbbbb1c..3c6cb081ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ after_script: jobs: include: - # release on github latest branch + # release on npm on tags - stage: release node_js: '8.10' env: @@ -63,13 +63,6 @@ jobs: after_script: skip script: skip deploy: - - provider: script - skip_cleanup: true - script: ./resources/npm-git.sh && npm install -g https://github.com/parse-community/parse-server#latest - on: - branch: - - master - - 3.x - provider: npm skip_cleanup: true email: diff --git a/CHANGELOG.md b/CHANGELOG.md index bd2670f58a..cdbac536ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ ### master [Full Changelog](https://github.com/parse-community/parse-server/compare/2.8.2...master) +### 2.8.3 +[Full Changelog](https://github.com/parse-community/parse-server/compare/2.8.3...2.8.2) + +#### Improvements: + +* Removes npm-git scripts as npm supports using git repositories that build, thanks to [Florent Vilmart](https://github.com/flovilmart) + + ### 2.8.2 [Full Changelog](https://github.com/parse-community/parse-server/compare/2.8.2...2.8.1) diff --git a/README.md b/README.md index 0b6a2ea132..c6fa1d05b6 100644 --- a/README.md +++ b/README.md @@ -393,16 +393,24 @@ If you believe you've found an issue with Parse Server, make sure these boxes ar # Want to ride the bleeding edge? -The `latest` branch in this repository is automatically maintained to be the last -commit to `master` to pass all tests, in the same form found on npm. It is -recommend to use builds deployed npm for many reasons, but if you want to use +It is recommend to use builds deployed npm for many reasons, but if you want to use the latest not-yet-released version of parse-server, you can do so by depending directly on this branch: ``` -npm install parseplatform/parse-server.git#latest +npm install parse-community/parse-server.git#master ``` +## Experimenting + +You can also use your own forks, and work in progress branches by specifying them: + +``` +npm install github:myUsername/parse-server#my-awesome-feature +``` + +And don't forget, if you plan to deploy it remotely, you should run `npm install` with the `--save` option. + # Contributing We really want Parse to be yours, to see it grow and thrive in the open source community. Please see the [Contributing to Parse Server guide](CONTRIBUTING.md). diff --git a/resources/npm-git.sh b/resources/npm-git.sh deleted file mode 100755 index 37c9707401..0000000000 --- a/resources/npm-git.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -e - -# This script maintains a git branch which mirrors master but in a form that -# what will eventually be deployed to npm, allowing npm dependencies to use: -# -# "parse-server": "parseplatform/parse-server#latest" -# - -# From: https://github.com/graphql/graphql-js/blob/master/resources/npm-git.sh - -BUILD_DIR=latest -BRANCH="${TRAVIS_BRANCH}" -TARGET="latest" -if [ "$BRANCH" != "master" ]; -then - TARGET="$BRANCH-preview" -fi - -npm run build - -mkdir -p $BUILD_DIR - -cp package.json $BUILD_DIR/ -cp README.md $BUILD_DIR/ -cp LICENSE $BUILD_DIR/ -cp PATENTS $BUILD_DIR/ -cp CHANGELOG.md $BUILD_DIR/ -cp postinstall.js $BUILD_DIR/ -cp -R lib $BUILD_DIR -cp -R bin $BUILD_DIR -cp -R public_html $BUILD_DIR -cp -R views $BUILD_DIR - -cd $BUILD_DIR -git init -git config user.name "Travis CI" -git config user.email "github@fb.com" -git add . -git commit -m "Deploy $BRANCH to $TARGET branch" -git push --force --quiet "https://${GH_TOKEN}@github.com/parse-community/parse-server.git" master:$TARGET