Skip to content

Commit

Permalink
fix deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
srossross committed Jan 13, 2018
1 parent 06a0062 commit 08759ce
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 11 deletions.
13 changes: 6 additions & 7 deletions .circleci/config.yml
Expand Up @@ -45,7 +45,7 @@ jobs:
paths:
- bin/stable.world

deploy:
deploy-develop:
working_directory: /workspace
docker:
- image: google/cloud-sdk
Expand All @@ -62,21 +62,20 @@ jobs:
- run:
name: "Authorize Google Cloud"
command: |
make deploy-fetch
make deploy-authorize
- run:
name: "Rollout to Stage"
command: |
make deploy-development
make deploy
workflows:
version: 2
build-test-and-deploy:
jobs:
- build
- deploy:
# filters:
# branches:
# only: master
- deploy-develop:
filters:
branches:
only: develop
requires:
- build
18 changes: 14 additions & 4 deletions Makefile
Expand Up @@ -38,11 +38,21 @@ deploy-authorize: ## authorize gcloud
gcloud auth activate-service-account --key-file $${HOME}/gcloud-service-key.json
gcloud config set project $$GCLOUD_PROJECT

deploy-master: ## deploy master version
sh deployment/master-cli.sh
deploy: export VERSION = $(git describe --always)
deploy: Env = probably.stable.world
deploy: ## deploy version
echo Development Deployment "$$VERSION"

deploy-development: ## deploy development version
sh deployment/development-cli.sh
echo "Uploading gs://stable-world-downloads/$(Env)/versions/$${VERSION}"
gsutil -h "Content-Type:text/plain" \
cp ./bin/stable.world \
gs://stable-world-downloads/$(Env)/versions/$${VERSION}

echo Uploading gs://stable-world-downloads/$(Env)/latest ...

gsutil -h "Content-Type:text/plain" \
cp gs://stable-world-downloads/$(Env)/versions/$${VERSION} \
gs://stable-world-downloads/$(Env)/latest

release: ## upload release
gsutil -h "Content-Type:text/plain" cp gs://stable-world-downloads/rc gs://stable-world-downloads/latest
Expand Down

0 comments on commit 08759ce

Please sign in to comment.