Skip to content
This repository has been archived by the owner on Mar 10, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/0.1.1' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Aug 13, 2018
2 parents f6be1bc + c2d769d commit 3392ba4
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 23 deletions.
4 changes: 1 addition & 3 deletions .bumpversion.cfg
@@ -1,10 +1,8 @@
[bumpversion]
current_version = 0.1.0
current_version = 0.1.1
tag_name = {new_version}
commit = True
tag = True

[bumpversion:file:README.md]

[bumpversion:file:package.json]

21 changes: 11 additions & 10 deletions .travis.yml
Expand Up @@ -6,6 +6,7 @@ branches:
only:
- staging
- develop
- /^greenkeeper/.*$/
env:
global:
# Github personal access token ${GITHUB_TOKEN}
Expand All @@ -18,13 +19,13 @@ before_script:
script:
- make build_development
- make build_production
# deploy:
# provider: pages
# skip-cleanup: true
# github-token: ${GITHUB_TOKEN}
# local-dir: build/production
# target-branch: master
# committer-from-gh: true
# verbose: true
# on:
# branch: staging
deploy:
provider: pages
skip-cleanup: true
github-token: ${GITHUB_TOKEN}
local-dir: build/production
target-branch: master
committer-from-gh: true
verbose: true
on:
branch: staging
19 changes: 19 additions & 0 deletions HISTORY.md
@@ -1,6 +1,25 @@
# Changelog


## 0.1.1 (2018-08-13)

### Changes

* Adding David dependency checker to badges. [Luis Alejandro Martínez Faneyth]

* Removing badge to trigger greenkeeper build. [REF] Activating deployment task. [Luis Alejandro Martínez Faneyth]

### Other

* Docs(readme): add Greenkeeper badge. [greenkeeper[bot]]

* Docs(readme): add Greenkeeper badge. [greenkeeper[bot]]

* Chore(travis): whitelist greenkeeper branches. [greenkeeper[bot]]

* Chore(package): update dependencies. [greenkeeper[bot]]


## 0.1.0 (2018-08-13)

### New
Expand Down
4 changes: 1 addition & 3 deletions README.md 100755 → 100644
@@ -1,5 +1,3 @@
# luisalejandro.github.io

[![](https://img.shields.io/github/release/LuisAlejandro/luisalejandro.github.io.svg)](https://github.com/LuisAlejandro/luisalejandro.github.io/releases) [![](https://img.shields.io/travis/LuisAlejandro/luisalejandro.github.io.svg)](https://travis-ci.org/LuisAlejandro/luisalejandro.github.io) [![](https://codeclimate.com/github/LuisAlejandro/pipsalabim/badges/gpa.svg)](https://codeclimate.com/github/LuisAlejandro/pipsalabim)

Current version: 0.1.0
[![Github release badge](https://img.shields.io/github/release/LuisAlejandro/luisalejandro.github.io.svg)](https://github.com/LuisAlejandro/luisalejandro.github.io/releases) [![Travis CI badge](https://img.shields.io/travis/LuisAlejandro/luisalejandro.github.io.svg)](https://travis-ci.org/LuisAlejandro/luisalejandro.github.io) [![Codeclimate badge](https://codeclimate.com/github/LuisAlejandro/pipsalabim/badges/gpa.svg)](https://codeclimate.com/github/LuisAlejandro/pipsalabim) [![Greenkeeper badge](https://badges.greenkeeper.io/LuisAlejandro/luisalejandro.github.io.svg)](https://greenkeeper.io/) [![David badge](https://david-dm.org/LuisAlejandro/luisalejandro.github.io/dev-status.svg)](https://david-dm.org/LuisAlejandro/luisalejandro.github.io)
14 changes: 7 additions & 7 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "luisalejandro.github.io",
"version": "0.1.0",
"version": "0.1.1",
"description": "Personal site",
"author": "Luis Alejandro Martínez Faneyth",
"repository": "LuisAlejandro/luisalejandro.github.io",
Expand Down Expand Up @@ -28,8 +28,8 @@
"browser-sync": "^2.24.6",
"browserify": "^16.2.2",
"browserify-shim": "^3.8.14",
"css-mqpacker": "^6.0.2",
"cssnano": "^3.10.0",
"css-mqpacker": "^7.0.0",
"cssnano": "^4.0.5",
"del": "^3.0.0",
"fancy-log": "^1.3.2",
"gulp": "^3.9.1",
Expand All @@ -44,7 +44,7 @@
"gulp-jsonlint": "^1.2.1",
"gulp-jsonminify": "^1.1.0",
"gulp-plumber": "^1.2.0",
"gulp-postcss": "^7.0.1",
"gulp-postcss": "^8.0.0",
"gulp-pretty-data": "^0.1.2",
"gulp-rename": "^1.4.0",
"gulp-rev": "^8.1.1",
Expand All @@ -61,13 +61,13 @@
"postcss-nested": "^3.0.0",
"postcss-preset-env": "^5.2.3",
"postcss-reporter": "^5.0.0",
"postcss-uncss": "^0.14.0",
"postcss-uncss": "^0.16.1",
"pretty-hrtime": "^1.0.3",
"require-dir": "^1.0.0",
"run-sequence": "^2.2.1",
"stylelint": "^9.3.0",
"stylelint-order": "^0.8.1",
"uncss": "^0.15.0",
"stylelint-order": "^1.0.0",
"uncss": "^0.16.2",
"vinyl-source-stream": "^2.0.0",
"watchify": "^3.11.0"
}
Expand Down

0 comments on commit 3392ba4

Please sign in to comment.