Skip to content

Commit

Permalink
Merge branch 'release/2.0.3'
Browse files Browse the repository at this point in the history
* release/2.0.3:
  release 2.0.3
  fix bower setup (#259)
  remove zip files from npm build artifacts
  remove deprecated version prop from bower.json
  • Loading branch information
pmb0 committed Nov 3, 2017
2 parents 696851b + 929ac67 commit 5504a98
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 21 deletions.
22 changes: 7 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,29 @@ node_js:
- "node"

addons:
apt:
packages:
- p7zip-full
apt:
packages:
- p7zip-full

env:
global:
- VERSION=$TRAVIS_TAG
- VVERSION=v$VERSION
- ZIP_FILENAME=shariff-$VERSION.zip
- TAR_FILENAME=shariff-$VERSION.tar
- TGZ_FILENAME=shariff-$VERSION.tar.gz
- BASE_NAME=shariff-$TRAVIS_TAG

script:
- npm run test

before_deploy:
- echo "$TRAVIS_TAG / $VERSION / $VVERSION"
- echo "$ZIP_FILENAME / $TAR_FILENAME / $TGZ_FILENAME"
- npm run build
- bash -c 'if [ ! -f $ZIP_FILENAME ]; then 7z a -tzip ${ZIP_FILENAME} ./dist/*; fi;'
- bash -c 'if [ ! -f $TAR_FILENAME ]; then 7z a -ttar ${TAR_FILENAME} ./dist/*; fi;'
- bash -c 'if [ ! -f $TGZ_FILENAME ]; then 7z a ${TGZ_FILENAME} ${TAR_FILENAME}; fi;'

deploy:
- provider: releases
api_key:
secure: "QK+97CEzaL5FwA09hs7II9PnBKn1KRUUOLtmGnIw83FiqI5dUtAfPxe0WuA9dwIVX9FKOtPacn5nSoPb0LVvWwdTxGN2DOnYrUW8pIsPGng1Z5kbD2feJdTIeXkVmKb8JYssq76L7O6SyXQbkrbYq6KmrjFH9bEEpGlcUOyKY+k="
file:
- $ZIP_FILENAME
- $TGZ_FILENAME
- $BASE_NAME.zip
- $BASE_NAME.tar.gz
skip_cleanup: true
script: npm run build_zip
on:
repo: heiseonline/shariff
tags: true
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## v2.0.3, 2017-11-03

- Fixed bower `main` entry. ([#259](https://github.com/heiseonline/shariff/issues/259))
- Removed zip files from npm build artifacts.
- Removed deprecated `version` property from `bower.json`.

## v2.0.2, 2017-11-02

- Fixed bower `main` entry. ([#259](https://github.com/heiseonline/shariff/issues/259))
Expand Down
6 changes: 2 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "shariff",
"version": "2.0.2",
"homepage": "http://ct.de/-2467514",
"authors": [
"Ines Pauer <[email protected]>",
Expand All @@ -10,8 +9,8 @@
"Deniz Sesli <[email protected]>"
],
"main": [
"dist/shariff.min.css",
"dist/shariff.min.js"
"src/js/shariff.css",
"src/style/shariff.less"
],
"description": "Shariff enables website users to share their favorite content without compromising their privacy.",
"keywords": [
Expand All @@ -24,7 +23,6 @@
"/.*",
"/*.js",
"/*.png",
"src/",
"**/.*",
"node_modules",
"bower_components",
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{
"name": "shariff",
"version": "2.0.2",
"version": "2.0.3",
"description": "Shariff enables website users to share their favorite content without compromising their privacy.",
"main": "src/js/shariff.js",
"scripts": {
"dev": "webpack-dev-server --hot --inline --port 3000 --content-base demo --entry app=./demo/app.js",
"test": "eslint src && karma start --single-run",
"build": "rm -fr dist && webpack -p"
"build": "rm -fr dist && webpack -p",
"build_zip": "7z a -tzip $BASE_NAME.zip ./dist/* && 7z a -ttar $BASE_NAME.tar ./dist/* && 7z a $BASE_NAME.tar.gz $BASE_NAME.tar"
},
"repository": {
"type": "git",
Expand Down

0 comments on commit 5504a98

Please sign in to comment.