From 560eb927e13daf1fbe683197537f08357ba44849 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Tue, 17 Jan 2017 10:11:56 -0500 Subject: [PATCH] Changed settings to use this-dot --- .travis.yml | 42 +++++++++++++++++++++--------------------- config/deploy.js | 6 +++--- ember-cli-build.js | 2 +- package.json | 4 ++-- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index b701cec..a04fb94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,38 +8,38 @@ cache: - "$HOME/google-cloud-sdk/" env: - CXX=g++-4.8 -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.8 before_install: - npm config set spin false - npm install -g bower - bower --version - npm install phantomjs-prebuilt - phantomjs --version -after_success: - - openssl aes-256-cbc -K $encrypted_25555bb76dbd_key -iv $encrypted_25555bb76dbd_iv - -in credentials.tar.gz.enc -out credentials.tar.gz -d - - gcloud version || true - - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi - - source $HOME/google-cloud-sdk/path.bash.inc - - export GOOGLE_APPLICATION_CREDENTIALS=client-secret.json - - export GCLOUD_PROJECT=global-ember-meetup-frontend - - gcloud version - - tar -xzf credentials.tar.gz - - mkdir -p lib - - gcloud auth activate-service-account --key-file client-secret.json - - gcloud config set project 'global-ember-meetup-frontend' - - test $TRAVIS_BRANCH = "master" && npm run deploy install: - npm install - bower install script: - npm test +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 +# after_success: +# - openssl aes-256-cbc -K $encrypted_25555bb76dbd_key -iv $encrypted_25555bb76dbd_iv +# -in credentials.tar.gz.enc -out credentials.tar.gz -d +# - gcloud version || true +# - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export +# CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi +# - source $HOME/google-cloud-sdk/path.bash.inc +# - export GOOGLE_APPLICATION_CREDENTIALS=client-secret.json +# - export GCLOUD_PROJECT=global-ember-meetup-frontend +# - gcloud version +# - tar -xzf credentials.tar.gz +# - mkdir -p lib +# - gcloud auth activate-service-account --key-file client-secret.json +# - gcloud config set project 'global-ember-meetup-frontend' +# - test $TRAVIS_BRANCH = "master" && npm run deploy notifications: slack: secure: FO+utM7EeHhsaQCt/uSYWSnh+fdgHoNFL9ySQsabcv6jPd41TQktPUSFl8ZUWSl6VnnQ6zJguew3KGG92iDbrApHOXeBzKy0gxeJDXVBW+74XhLsVZMRy6el6YlNHAqDlKsSA57iFEWyhSGU0TiCbWtzLJDyFviduaVIt5v7XuyDRFIo8J6df1MaLLW9z5JQ1x94gGRdAx/dYInSTi5UyuVBH0bUejxUrR1W2CfWpduIV+xlkBxPQVkWvT/gbvn6pNclv4OGEHXAMZCbZiFssXEhZmK/fmbp6WMGScZuQ8AlQxJOA10R1zLKTyIn0lPbVEppqYPTzHwbgsLNqO/GV1ejyafjBwwx3mlxT6Yj9SrDzmDsPgPzwAWbnPaf/7tiVYRkwnq+8HxtQl1Kp+HC8LZpugzABYotnSUQajDGR3B1skHdPEt+fJjHW36Q2UrQjR+xWt64xvMlEiH1ae+nmd0nYo+g+k/dbgNsSpe/HfjCnaDRLmd+fsWfMMjTFtI5I8DhyZH39oXKNDXa+KQ6uaWxnAnmE+QByGPN9/ZtesiENt/G8/MhuVII3QFP9njD1FOXyvEB+/ATTeKB0SffIJoq7kAzuCH80BSlNWoLOh1m+rcvxgkaJJHqPZwqzg/pZjn+yk+x0NBe1yrfnty6yPaRWJsN7/pKbuhzA4q88Nw= diff --git a/config/deploy.js b/config/deploy.js index ff0a5d5..17b1190 100644 --- a/config/deploy.js +++ b/config/deploy.js @@ -1,11 +1,11 @@ -module.exports = function(deployTarget) { +module.exports = function() { return { 'gcloud': { - bucket: 'global-ember-meetup-frontend', + bucket: 'embermeetup', key: 'fastboot-release.json' }, 'gcloud-storage': { - bucket: 'global-ember-meetup-frontend' + bucket: 'embermeetup' } }; }; diff --git a/ember-cli-build.js b/ember-cli-build.js index 45c3e99..8416b93 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -11,7 +11,7 @@ module.exports = function(defaults) { ] }, fingerprint: { - prepend: 'https://storage.googleapis.com/global-ember-meetup-frontend/' + prepend: 'https://storage.googleapis.com/embermeetup/' } }); diff --git a/package.json b/package.json index 6942bdd..2116194 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "build": "ember build", "start": "ember fastboot --serve-assets", "test": "ember test", - "deploy": "GCLOUD_PROJECT=global-ember-meetup-frontend ember deploy production" + "deploy": "GCLOUD_PROJECT=this-dot ember deploy production" }, "repository": "", "engines": { @@ -31,7 +31,7 @@ "ember-cli-dependency-checker": "^1.2.0", "ember-cli-deploy": "0.6.1", "ember-cli-deploy-build": "0.1.1", - "ember-cli-deploy-gcloud": "0.2.5", + "ember-cli-deploy-gcloud": "0.3.3", "ember-cli-deploy-gcloud-storage": "0.1.2", "ember-cli-fastboot": "1.0.0-beta.4", "ember-cli-google-fonts": "2.3.0",