[Pkg-javascript-commits] [leaflet] 41/78: port new release config from master

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet.

commit 8032c24eefcff246be50f3d8e7fd005892659151
Author: Vladimir Agafonkin <agafonkin at gmail.com>
Date:   Mon Oct 26 11:40:20 2015 +0200

    port new release config from master
---
 .travis.yml      | 45 ++++++++++++++++++++++-----------------------
 build/publish.sh | 29 +++++++++++++++--------------
 package.json     |  4 ++--
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc4ce44..4c8336c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,27 @@
----
+sudo: false
 language: node_js
-node_js:
-- "0.10"
+node_js: 0.12
+addons:
+  artifacts:
+    paths:
+    - dist
+    target_paths:
+    - content/leaflet/${NAME}
 env:
   global:
-  - "ARTIFACTS_S3_BUCKET=leaflet-cdn"
+  - ARTIFACTS_BUCKET=leafletjs-cdn
+  - ARTIFACTS_PERMISSIONS=public-read
   - secure: |-
-      LnvY/vWpmAIObabLrpu1mWYw1udllVpZJrrhzsn3traL+qU6yaGniQOn6u+l
-      iWSCuu7kXX3xv1GD7Fc6lTfQCg9F9dukWv9zlc4gFciyRpiUBuluuqtdV51A
-      5yqpLkMpX2PMG7vwrOYttVW0uDlUcwGjyHxWZvnBOXCnnHSpnbI=
+      JlC1rD7WryxlUbWmD3NWVX9E60XB/+ss7+j0OaY3WqWziGUWDCuoVkOMGXnp
+      Ev27O8qhlmRkeyiimUN64UzK0yeZ139DcZMY6r4A5E2kwHYRAO/H/zl5RAGo
+      Yd9GUPwZfr3xV8WhH2GFy/L/mRjkGwue2o6ZxdsqBOKfYaF9Ryg=
   - secure: |-
-      EQ4c2c8VklzFZRxKnizI0/VK0anHhlyc1Rv0vqkMj/YPKxmbWNfOlsOCN2gM
-      p+q8QzCG1Np9D1Kq9K0miYqHgZxgu4D/4Mwy04bh1UfyoUcDfB1tJmEtsKY/
-      8Bl46ZfhxbTG39b6Y315GuU+49QdFMEXhSqx/G7on1xC4aYLXLc=
-before_script: >
-  test ${TRAVIS_BRANCH} = master ||
-  test ${TRAVIS_BRANCH} = stable &&
-  test ${TRAVIS_PULL_REQUEST} = false &&
-  gem install --no-rdoc --no-ri --version 0.8.9 faraday &&
-  gem install --no-rdoc --no-ri travis-artifacts || true
-after_success: >
-  test ${TRAVIS_BRANCH} = master ||
-  test ${TRAVIS_BRANCH} = stable &&
-  test ${TRAVIS_PULL_REQUEST} = false &&
-  travis-artifacts upload --path dist --target-path build/${TRAVIS_BRANCH} &&
-  cd dist && zip -x .DS_Store -r leaflet-${TRAVIS_BRANCH}.zip . &&
-  travis-artifacts upload --path leaflet-${TRAVIS_BRANCH}.zip --target-path build
+      XW1hzORAtSpTgTKkQwel5gRMDy6SotzeSRsVV2jQCn46VIMx8G/J5nOI+ImL
+      yeoH12PhCR0h39dM7mq8TYJo5DHwvbotI5nQhpMruSt8eMFbym8nGiqQh806
+      fSJXkxmQ4MAjUdNFDIirBHhdZme8q3PueFzJ+5odFMvPGn/aITQ=
+after_success:
+  - npm run build
+  - cd dist && zip -x .DS_Store -r leaflet.zip . && cd ..
+  - NAME=$TRAVIS_BRANCH
+  - '[[ $TRAVIS_PULL_REQUEST != ''false'' ]] && NAME=$TRAVIS_PULL_REQUEST'
+  - '[[ -n $TRAVIS_TAG ]] && NAME=$TRAVIS_TAG'
diff --git a/build/publish.sh b/build/publish.sh
index 67136ac..f91291c 100755
--- a/build/publish.sh
+++ b/build/publish.sh
@@ -1,25 +1,26 @@
 #!/bin/bash
 
-# get current version
+npm update
+
 VERSION=$(node --eval "console.log(require('./package.json').version);")
 
-# Build
-git checkout -b build
 npm test || exit 1
-npm run prepublish
-git add dist/leaflet-src.js dist/leaflet.js -f
 
-# create the bower and component files
-node_modules/copyfiles/copyfiles -u 1 build/*.json ./
-node_modules/tin/bin/tin -v $VERSION
+git checkout -b build
+
+npm run build
+git add dist/leaflet-src.js dist/leaflet.js dist/leaflet-src.map -f
+
+copyfiles -u 1 build/*.json ./
+tin -v $VERSION
 git add component.json bower.json -f
 
-git commit -m "build v$VERSION"
+git commit -m "v$VERSION"
+
+git tag v$VERSION -f
+git push --tags -f
 
-# Tag and push
-git tag v$VERSION
-git push --tags --force
+npm publish --tag beta
 
-# # # Cleanup
-git checkout stable
+git checkout master
 git branch -D build
diff --git a/package.json b/package.json
index 6f38447..4e69270 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
   "main": "dist/leaflet-src.js",
   "scripts": {
     "test": "jake test",
-    "prepublish": "jake build",
-    "publish": "./build/publish.sh"
+    "build": "jake build",
+    "release": "./build/publish.sh"
   },
   "repository": {
     "type": "git",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet.git