Merge remote-tracking branch 'origin/master'

This commit is contained in:
Zakary Timson 2019-04-16 10:37:56 -04:00
commit cb2023f8d2

View File

@ -56,29 +56,7 @@ jobs:
- run: - run:
name: Deploy name: Deploy
command: gsutil cp -r dist/ZaksCode/* gs://staging.zakscode.com command: gsutil cp -r dist/ZaksCode/* gs://www.zakscode.com
deploy-prod:
docker:
- image: google/cloud-sdk:latest
working_directory: ~/repo
steps:
- checkout
- attach_workspace:
at: ./
- run:
name: Authenticate GCP
command: |
echo $GCLOUD_SERVICE_KEY > key.json
gcloud auth activate-service-account --key-file key.json
- run:
name: Depoly
command: gsutil cp -r dist/ZaksCode/* gs://zaks-code.appspot.com
workflows: workflows:
version: 2 version: 2
@ -92,9 +70,3 @@ workflows:
filters: filters:
branches: branches:
only: master only: master
- deploy-prod:
requires:
- build
filters:
branches:
only: production