Skip to content

Commit

Permalink
Merge branch 'release/0.3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
towerz committed Jun 16, 2019
2 parents 855d0e5 + a3ea908 commit f7338b1
Show file tree
Hide file tree
Showing 20 changed files with 35,210 additions and 50,065 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: node_js
sudo: false
node_js: "8"
node_js: "10"
cache: yarn

before_install:
Expand Down
1 change: 1 addition & 0 deletions .yarnrc
@@ -0,0 +1 @@
--install.ignore-engines true
12 changes: 7 additions & 5 deletions bower.json
@@ -1,7 +1,7 @@
{
"name": "clappr",
"description": "An extensible media player for the web",
"version": "0.3.4",
"version": "0.3.5",
"homepage": "https://github.com/clappr/clappr",
"authors": [
"Globo.com"
Expand Down Expand Up @@ -32,7 +32,7 @@
"coveralls": "^3.0.0",
"css-loader": "^0.28.10",
"cz-conventional-changelog": "^2.1.0",
"directory-named-webpack-plugin": "^2.3.0",
"directory-named-webpack-plugin": "^4.0.1",
"eslint": "^4.18.2",
"file-loader": "^1.1.11",
"gulp": "^3.9.1",
Expand Down Expand Up @@ -60,10 +60,12 @@
"svg-inline-loader": "^0.8.0",
"sync-pkg": "^0.7.2",
"uglify-js": "^3.3.12",
"uglifyjs-webpack-plugin": "^2.1.2",
"url-loader": "^0.6.2",
"webpack": "^3.11.0",
"webpack-bundle-analyzer": "^2.11.1",
"webpack-dev-server": "^2.11.1",
"webpack": "^4.31.0",
"webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.3.2",
"webpack-dev-server": "^3.3.1",
"yargs": "^11.0.0"
},
"keywords": [
Expand Down
12 changes: 7 additions & 5 deletions bump
Expand Up @@ -20,11 +20,7 @@ build() {
echo 'building clappr.js' &&
yarn build &&
echo 'building clappr.min.js' &&
yarn release &&
echo 'building clappr.plainhtml5.js' &&
yarn build:plainhtml5 &&
echo 'building clappr.plainhtml5.min.js' &&
yarn release:plainhtml5
yarn release
}

run_tests() {
Expand Down Expand Up @@ -64,6 +60,12 @@ send_mail() {
}

main() {
npm whoami
if (("$?" != "0")); then
echo "you are not logged into npm"
exit 1
fi
git flow release start $1 &&
update_dependencies &&
update_version $1 &&
update_bower &&
Expand Down

0 comments on commit f7338b1

Please sign in to comment.