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.

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

Changed settings to use this-dot #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 21 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=
6 changes: 3 additions & 3 deletions config/deploy.js
Original file line number Diff line number Diff line change
@@ -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'
}
};
};
2 changes: 1 addition & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = function(defaults) {
]
},
fingerprint: {
prepend: 'https://storage.googleapis.com/global-ember-meetup-frontend/'
prepend: 'https://storage.googleapis.com/embermeetup/'
}
});

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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",
Expand Down