Skip to content

Commit 53f8dfb

Browse files
authored
Merge pull request #566 from Gaurav0/fix_canary_deploy
Fix deploy for canary
2 parents d841f41 + f243b34 commit 53f8dfb

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

config/deploy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module.exports = function(deployTarget) {
44
var ENV = {
55
build: {
6-
environment: deployTarget
6+
environment: 'production'
77
},
88
'revision-data': {
99
type: 'version-commit'

config/environment.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* jshint node: true */
22

33
module.exports = function(environment) {
4+
var deployTarget = process.env.DEPLOY_TARGET;
45
var rootURL = process.env.TWIDDLE_ROOT_URL || '/';
56
var host = process.env.GH_API_HOST || 'https://api.github.com';
67
var toriiGHEBaseURL = process.env.TORII_GHE_OAUTH || null;
@@ -71,7 +72,7 @@ module.exports = function(environment) {
7172
ENV.host = undefined;
7273
}
7374

74-
if (environment === 'production') {
75+
if (deployTarget === 'production') {
7576
ENV.githubOauthUrl = process.env.GATEKEEPER_URL || 'https://ember-twiddle.herokuapp.com/authenticate/';
7677
ENV.assetsHost = process.env.TWIDDLE_ASSET_HOST || '//assets.ember-twiddle.com/';
7778
ENV.githubApiKey = process.env.GH_API_KEY || '3df37009938c0790d952'
@@ -83,7 +84,7 @@ module.exports = function(environment) {
8384
}
8485

8586
// staging to GH Enterprise is not currently supported.
86-
if (environment === 'staging') {
87+
if (deployTarget === 'staging') {
8788
ENV.githubOauthUrl = 'https://canary-twiddle-gatekeeper.herokuapp.com/authenticate/';
8889
ENV.assetsHost = '//canary-assets.ember-twiddle.com/';
8990
ENV.githubApiKey = '085e033505c9d26ec27a';

0 commit comments

Comments
 (0)