Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

I51 #53

Merged
merged 6 commits into from
Jan 31, 2019
Merged

I51 #53

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47ed633
Removed the server directory
oktay-sen Jan 31, 2019
90d5cdb
Added jest testing to firebase functions.
oktay-sen Jan 31, 2019
e8be1d9
Jest temporarily passes without tests.
oktay-sen Jan 31, 2019
8900705
Resolved merge conflict
oktay-sen Jan 31, 2019
2a264e8
Fixed travis deployment not working
oktay-sen Jan 31, 2019
40b3ba0
Merge branch 'beta' into i51
oktay-sen Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
stages:
- test
- name: deploy-beta
if: branch = beta AND type != pull_request
- name: deploy-master
if: branch = master AND type != pull_request

jobs:
matrix:
include:
- stage: test
language: node_js
Expand All @@ -16,11 +9,11 @@ jobs:
- nvm install node
- node -v
- npm install
- stage: deploy-beta
script: skip
deploy:
provider: firebase
token:
secure: eZTl4E2ocCVJqeB+P3yvtT1DiR9pZWNObS6lRE4wWEYQGzt5zJ2DJUvbz75fxQbNYQM+rO0n9u7xBfsx5IUVQyppH3Wjp7sJsRt5e2XI36nYE3bZcwCpDpRPrpKXGyMg2DCjZYGSBai8oXJ+DCj/39RVOy1BE1alHTL0WkLC8HRV5hNZFOaSXdNtbjyXHkHO5ZtjndsG5D3+q5zXfQ5SHpEMKjBGlzQ9wt+6q11Ag4VlEbWIDlRwbhOiJ4IAO+7K4s0E6J54mvMFzhAeJzZxkvK+fmZN+cG9XF/lmeILLypkGHiYRTHjDlePHRyqHoiDpSOwXwCjOeMJGeg+H1dW0F6KEL5qZ7UITajWhjYXFMThDEGj2qtj5dUjhkuu+gUsnumZ3KB38fRG9AGrzZB2+GIGLto/R0bFJPin+5hxDAClkCGEDZz2sjsV77IKv1UoOfp/1oB78+8B3gcAHxA9zT5ks5gqazrT7lJdkaUUupOIiBnvR3+OI0WQwHYuMqk2beCdvpjDxzCPEUjP9kzlTa3y/YIDbfP3Jv8uLodiImuvLwxFl281cNrJUsMpjTqXxn/OVhSzk+YygnlsA1rrTkDqkj1/fUAdEi7Y4e1F7AT3YOLd1DAd/wQoCYlZeEG8B9SowxFVhsdPPPFpSkFUL8YiqdDAAxViUt3hi9gUzg8=
project: "assis10t-524c5"
message: "Travis beta deploy: $commit_message"
- provider: firebase
token:
secure: eZTl4E2ocCVJqeB+P3yvtT1DiR9pZWNObS6lRE4wWEYQGzt5zJ2DJUvbz75fxQbNYQM+rO0n9u7xBfsx5IUVQyppH3Wjp7sJsRt5e2XI36nYE3bZcwCpDpRPrpKXGyMg2DCjZYGSBai8oXJ+DCj/39RVOy1BE1alHTL0WkLC8HRV5hNZFOaSXdNtbjyXHkHO5ZtjndsG5D3+q5zXfQ5SHpEMKjBGlzQ9wt+6q11Ag4VlEbWIDlRwbhOiJ4IAO+7K4s0E6J54mvMFzhAeJzZxkvK+fmZN+cG9XF/lmeILLypkGHiYRTHjDlePHRyqHoiDpSOwXwCjOeMJGeg+H1dW0F6KEL5qZ7UITajWhjYXFMThDEGj2qtj5dUjhkuu+gUsnumZ3KB38fRG9AGrzZB2+GIGLto/R0bFJPin+5hxDAClkCGEDZz2sjsV77IKv1UoOfp/1oB78+8B3gcAHxA9zT5ks5gqazrT7lJdkaUUupOIiBnvR3+OI0WQwHYuMqk2beCdvpjDxzCPEUjP9kzlTa3y/YIDbfP3Jv8uLodiImuvLwxFl281cNrJUsMpjTqXxn/OVhSzk+YygnlsA1rrTkDqkj1/fUAdEi7Y4e1F7AT3YOLd1DAd/wQoCYlZeEG8B9SowxFVhsdPPPFpSkFUL8YiqdDAAxViUt3hi9gUzg8=
project: "assis10t-524c5"
message: "Travis beta deploy: $commit_message"
on:
branch: beta