Skip to content

Commit

Permalink
Merge pull request #1880 from habitat-sh/eeyun/web_acceptance
Browse files Browse the repository at this point in the history
Approved by: @nobody from Nowhere
Merged by: The Sentinels
  • Loading branch information
thesentinels authored Mar 2, 2017
2 parents 7660fd4 + 94b924b commit a70f3cb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ matrix:
- AWS_DEFAULT_REGION=us-west-2
- AWS_ACCESS_KEY_ID=AKIAJ2XVYOYEVJT77NJQ
# NETLIFYKEY
- secure: "MZEYcFLkI7eGxz4z+/KcJZi4xWUyW2WQcENHbMXYt+Ec+lfSuarlgEDsTazVtjh3M8ZpCbPj5BIOeRHj3ajzVL62yxZelSkdkepiM734Th2gTzyLSqcICmZ8HZlCzKWWF4PBZQWJ2i9qU/jI4Ir1IFgkraVLnz1mu/Ah/O9R7rI+Xlo4bDj4iQ+QhXgf/XEByb4YkHS6vLXbIsYKVAt1MClw0dFzB7rBcqQaYS6XgziCeD0T3r+dTS5aFe3dowFgslI6js0DGwg4jevp9ketap4WqaukPUnBuQ2TSQ+o2oANnv8pZrPliL6mnsyGwk0MDdJBCPAr37AsDPc+3d5MGJyHwldLQ2QRFIjRE+9APf3OcqhNrmzuy0j4JRMOhoYlY2fWYNk2AT76wcheEoqpY3qWeOtSlqf9X0XNHokbiqWTYbyhCUBbcQgnimN3/E19wvtCqzk6+ak8z71eYZsihDBSRjk/wpPWF5o0SpVncKI+392Zq48n+SoFaGx4yLYV+5ULl9T1hKTNc/WN0sQlkBOfdzDIcrNlGOVOWtqRoI+xZv6AUpzpcIEYateEZsA+QDMlsFIfZEz5whTqQXXf+++qRDiwC0mT/zplH4cpoT2rv9uTyge0urhx0EZ9zY8WQvLmGHsYBZ5cBwKnkPZTzmbjkuQTNc4dUwfOPfpY7wA="
- secure: "EyM8UThsqW8bFLzhUs/YeqDyGZh5dplgFkCs6Ps7hLx30BQArMy9PV8xVfvGfoWtLunw0TrBWd6vwmymF6Hf8Dv/p/qQgRD5m3OVSx50KJA7TTr42AhfKmfGfWaSQVYE8SayAiE+fPb4eHB85hekfpt2yawuRbUNyzCfmcic4sX+IIUBKHJih+6P+ovP9+aYXmo62VwEaLac0sOWB6n7wa57Y4vs/BIf4B3CjOUqAVpFxHdply+WcBCxuja3AQGyebofPpe7A+NdNoGgOSKiWgGL0ke7rW1/8r3icqQO0/MigOkvdZz8l/p19aeMcUR7NfDjTCKC8y4HbXIUltjHlatCiFPwjyqC9req/RTK7fYid7mOdQ6VEQD28oW0l4geEgwQltV6N/nsKmNX5JFvr7BhR3FKV3F7oA+bwUBBntxzPqkgSYOSwz4HnfZhTdJWtD0h1FYFU+rcHXw5JRTdoS0gA2wG22yXuROjOewPt0rIrrFHw8rj5T+457P55h33k4P+Ekx8W70TarSP0uweB646nGj62IHGXKrLS6VHwTeWxLwf9wdMx3c+JLrm4VPe0FHY642MlW2AERvDu9f48xGvwNUF9y+cIsGkghB1USYqs82tTW/oV9sAmRwoWPuBlT1mFf5RQe6HGXA/T7ThO/F7aKFWj8FZFG9BNNWDfq0="
# AWS_SECRET_ACCESS_KEY
- secure: "p9bQyftYcDPrmRpU3SUHj6xB/KH5jSiNqKoNMhXcQjasSV3nnPkGp18ZCKiRNO5WOMq8pX9mp6BENnHSj8WM9G8RxYK678fi+JIkTkrbtlcT8HAIRr4K3p0vD7y6G4xO3QuFbBY4FbD4WRdnrAQ1lgEQey5LHn5bGr95TDDVefN06ddDpE0wJE0/kBhC76ipZlmGuOwKmti1igvhmWHYWlYt7J4nFaTphpKi0NwrAtR2X5B+xnIhuy4I8dPBfYLA366acHMip/jvMf2v7JTSW5+WPIHDOTQy8cXvD4akokerGo+xMhClXoUNpBkdSW5arcyL8Zd4YWzsZHso4UXhMllU+fspPaZ6Lkz2Wor/oTWkqkMEAtX06Nxtb/47qjkoDAjHwoZrlrKqqVYE8/pYb6UAMJy/s92BD3dKKLitQ5ge62Sgc4wTl3p7aSDMbEDdzxBHfZPu+j2RmPkaTFeU4Zmuat1iSy5ca7Y+DvNk4Ryoh5Bt0oUs4MY4aviLY20g6VegfP/cbzdMhdUFjA36aVMOZ+4lK5sJoaYvyJFAAMJb2eLQQHcVkJ9v816K1R2EtuzggIBU6TRDZPsJfPMBd/LFBDaQzMX1BTO73Vd2Y8RK/DDDXDFMlW8xsC36UhvjKFEmixX3ZbC7I/CHuuok9eNnSB86xVMYU0iyXuC/wiY="
# FASTLY_API_KEY
Expand Down
2 changes: 1 addition & 1 deletion support/ci/deploy_website.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [[ "${TRAVIS_PULL_REQUEST}" = "false" ]] && [[ "${TRAVIS_BRANCH}" = "master"
cd www
make deploy
else
if {{ "${TRAVS_PULL_REQUEST}" = "true" ]] && [[ "${TRAVIS_BRANCH}" = "master" ]]; then
if {{ "${TRAVIS_PULL_REQUEST}" = "true" ]] && [[ "${TRAVIS_BRANCH}" = "master" ]]; then
echo "We are on a PR or against the master branch. Deploying to Acceptance."
cd www
make build
Expand Down

0 comments on commit a70f3cb

Please sign in to comment.