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.2' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Aug 13, 2018
2 parents 4b0b6b2 + db14d98 commit 26d3410
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.1.1
current_version = 0.1.2
tag_name = {new_version}
commit = True
tag = True
Expand Down
8 changes: 5 additions & 3 deletions .travis.yml
Expand Up @@ -9,8 +9,8 @@ branches:
- /^greenkeeper/.*$/
env:
global:
# Github personal access token ${GITHUB_TOKEN}
- secure: "EWJmJqwiJlZAHJT2j43WEMHfZ6r0wzdPEruQ5FmiCMW8pXAq/kyIIzkXiPhIjDpydzoocm6sCwWGFRZcjlPrG2s2B3SuYJOHrVMa9iOOpTTa3jYgljdi4AfqkyyYC6VNRUXk5IK4kwUttvVFCSzjf2XSGLmYJNHMcMR1uSE1CJk="
# Github personal access token ${GHTOKEN}
- secure: "HlPlRD7aMngVSbeUMps+CPhiP6ax3tUtQGS3G6V072iF8eNS8kPo6jo+q5mH5i5zU8eV4uidkSCVwC9WSrgpxg/3edmUO+u+KOErs9gagzQ5mQ44PEDtQeNOnVGi4GespQknkTHKtsogQQ0srUJcALbdpzNtgnKW1Agfs8QxJ7g="
before_script:
- mkdir -p bower_components node_modules vendor/bundle
- sudo chown -R 1000:1000 .
Expand All @@ -19,10 +19,12 @@ before_script:
script:
- make build_development
- make build_production
- sudo chown -R ${USER}:${USER} .
- cp CNAME build/production
deploy:
provider: pages
skip-cleanup: true
github-token: ${GITHUB_TOKEN}
github-token: $GHTOKEN
local-dir: build/production
target-branch: master
committer-from-gh: true
Expand Down
7 changes: 7 additions & 0 deletions HISTORY.md
@@ -1,6 +1,13 @@
# Changelog


## 0.1.2 (2018-08-13)

### Fix

* Fixing Travis build. [Luis Alejandro Martínez Faneyth]


## 0.1.1 (2018-08-13)

### Changes
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "luisalejandro.github.io",
"version": "0.1.1",
"version": "0.1.2",
"description": "Personal site",
"author": "Luis Alejandro Martínez Faneyth",
"repository": "LuisAlejandro/luisalejandro.github.io",
Expand Down

0 comments on commit 26d3410

Please sign in to comment.