Skip to content

Commit

Permalink
Merge branch 'release/1.2.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
mick352 committed Sep 5, 2019
2 parents 32c6874 + f085158 commit a2566b9
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
25 changes: 14 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ before_install: yarn global add greenkeeper-lockfile@1
before_script: greenkeeper-lockfile-update
after_script: greenkeeper-lockfile-upload
deploy:
provider: npm
email: [email protected]
api_key:
secure: "ec7ey2S0EsWLWAuPPQ5InIfij0llJAVfrWF/BhBtnayIr7VPVxBuR9Q63W+GE4vBQNYklxMQGqgXmzaOAtSOoiAy6XxOlqL+CodIJ/PSwdgk1RQVAfXNRRSykYa9Bt+lrIKZyxUqWZysXyGMNtD/vpBSHjI/z3VcDL/DEonUfC5JZNt0cHxLjwVeV/gBWYzTlZamn4ktvqQ4u7fBfcVoVSld8G/qCkObC8+oFTFH7XhBdkQ0keect+7X7T7J1pvpTAld7ORd6AXBU2mnqUDC4SdKdALWefMvdpy0pmEohN4QMBwYNseNRmELlxJhKrn65hbKJLKgI3VrzNtASBGmyU9NMA4ZP7SZ5WmWvX8RwzNENN0OyYa0BupGCo/9xqzgKd1DT25ePtury4kfyxHybDAVSn2BJGvNLGr1YWa3Y8AOrK1wHf6DZcG9tk3cjGXU2Dcbn1gTGav5EZduSqyUzxODpJkkSB+ag8PpxO6pwQpIrpsy5PBrowmAsXBz3IPp9dUr8kEdViSd5HVcsmBspkKv7qzwgQhASNnt62i6w4IT2mibh3xoGisbNPPKc1/N1dsdoo3plxcsRQQ1+/3vKe7U6fRQzjNZ89JBOf4I0BHsUm+pbh3k7nZfWSsY3GuZ9w0HbU7583DeoA1uwLt2p6d3w/oLNr2+JRdeP5pTeSQ="
on:
tags: true
repo: heiseonline/embetty-server
node_js: '8'
env:
global:
secure: ZJ2A+YqqLfcRmOYG6+36ZapATBi2sVRjvHr+o6rVHfFIz6ltQCam2HvPmaHjIEu5A/ha1kktMtFFzWXiz2MjaGGe2754Xcv91832Uq9F5bxnHimDM6EeCS6EMvWyqwuaRKTSFoSJA4S8QvCWkTEVr/LkUTdxwDAKa/VXtxi4/E2D9cz28tKMEUFh4EVRewB8XOmg38VjGuoy9QtuHF/iXAif4TsPu9wXCRvLtdW00dyRAsKj2myHPbuvZTW1w5hBi4u7B3TcwxmORxBrDHmppU8IioVpIHhHnR81RdSJkqjq6ehch3B4HpMeFt0XyJTedHjtFMN7Kn+n1y8tLcscbdazsS8GgzFpq6tWWfkGhI9hJ0hucwaXXm8HZudlaBIQaizEMScwYiq8kHq7P1dyKl24WFpTf9kJivU+j110s+oxpiRXRVaDcbyJ51c+RnqSzc3KMDtJX8zk/bN+J83wXdkOIBsHgehKQgb7PhMGAiiVtaxZt/h9bp0iMScXwd/MUlGA5XUizU46EE3BkU9meD110RJFUAHfCc64YIfTJmCoa6wpOIRQ0ZoTsWlWAMayHL/k0ZFQXDRY/rGuwk8NNFndniq+J0fsVhGVQhOYk4UXxwskutSJf2LUYa3lOVF/NHni7msYbuQFFYV06pB2NekrZu3Xj2Zsjc6JEX+bLec=
- provider: npm
email: [email protected]
api_key:
secure: "FaqCdlJroVVkN498GncaLr0X3rt51Ep8LzObEx4I1/bOfbpgmr1aliDNxEB2vWQ2i1kL5r5w7mtzNx8a2VqdlVMlQshleh4un0jlA3Jl4OD7OFeckw7w1CUqlH5XaGPOUYbt44axKl2/GmsCt5DyAzDB1xxPam7Ac8icPAU40i5Px3ZqPUir2ZTJHjxikF8dI5thQCCYVJYyTyr+jJx3V9SiemWWGGn51hECltk7VWCQ7v64ZCuw7+oa5EH9zY150rDR3U9HUldl4jitQxOE3F1mjz600qC10Iaex3OYpZCHpDdUgmhXUq5pvC9pnuVdSCpo6PMR6rbsk80581T8zLd/MdAmY5jYH2YlM5bM2gyz87Y74vHQNjEXV7X7mfv0WAZEc9VKXSBhpj7WtAAJBgXpI7eZ4ohKYgVeds1PdxRZIlt/k7p03PL4gSLOYH5Io8y86wowUEiK+s6cQni1GR/6kOeIc8nRrjDR9gu07uKVYGyuOvPYFZT3PZXhSNv5U8+J4EDgPh8/m0m4hv4l4paBIhTQFsuGpDYGY5Z4PEm0qX2BmN365VTlpPwNDTCLuqzUFaBixJZg3KqMWcaCF7iQfQWdIxvjbBCC+sXNEiY5HstVXlcv/CWvff/fXYIXuwhS5f4FZwH9YUR0uvATuFjJ2jVxbjtCXP9sbdmBvZI="
on:
tags: true
repo: heiseonline/embetty-server
node_js: '8'
- provider: releases
api_key:
secure: Vo1gHWeP+02o3kTRqC5LjdowXkXmd1wgnuyzBWnYYqt3+Q2k67QxgqxzWXK1lGPKSy/1fqdnRcczd7QG81vAmCbSA6Apykr/9tYi+bSUfRpPSdlnL1Eq/GaV8zOlt8U22xxtUTiCcw6N5W89Mzi42EoYuDF4/16Y8d289lIwyZuBS61BRPpaIXCp0cLIcz9XVnxeCdAI/gtTCKMSc29CaUDYRFR8YQUvbQOsdSGDVzgDNhR+vuD5q2WJgFW/rqIIcq4oSlDVK0FmRmS21aR+s5EWxlNIs2PN/0UL3ubpnlJbMpNK0FGdnBQSORKE0y4DrQ6sLAT+dw/3UwNcpx7w486+fgkuzmsqtqnzpe8n9tMpduQYjl+6oF14xgevGDorKEr7Vy/GRThM+adfZmzpJ9z2iT6cpIC1ZvQ9hXC+dO0QRv44T30W0xB+40pI2e+9biDBOg5YEm/BD0n3KLkBFhFPSlOJSah3d0Pp4BxW+fsCHrkUehbcZ5uMuCPfgx4Rjx37uaVp81fvRL1SGLFtTz8oOPrqt1exl84MCTqdt0mSdoi9+HUUkLvFIfGM7et3x4rsb81HLGfY2cecNCqR9Vw/Hxe3SBBEoNWnpn6EmNgL/zF7zcJYuV58fEp/o7ytQnNAvAFBcepH24Xh7D6Ik2oIvN48ityHY5x+vBFyLao=
on:
repo: heiseonline/embetty-server
tags: true
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v1.2.5, 2019-09-05

- Chore: fix travis deployment

## v1.2.4, 2019-09-05

- Upgrade embetty-base, fix cloudflare error
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@heise/embetty-server",
"version": "1.2.4",
"version": "1.2.5",
"main": "index.js",
"repository": "[email protected]:heiseonline/embetty-server.git",
"author": "Philipp Busse <[email protected]>",
Expand Down

0 comments on commit a2566b9

Please sign in to comment.