From 2ef74a058ce2aae2de875b21368eef1eb1af6654 Mon Sep 17 00:00:00 2001 From: Ives van Hoorne Date: Thu, 17 Oct 2019 11:13:33 +0200 Subject: [PATCH 1/3] Test pr build --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 00000000000..e69de29bb2d From 9b1efc16fcab455fb25a096259b2b482c2ab5127 Mon Sep 17 00:00:00 2001 From: Ives van Hoorne Date: Thu, 17 Oct 2019 11:19:10 +0200 Subject: [PATCH 2/3] Change check of PR env var --- packages/app/src/app/overmind/internalActions.ts | 2 +- packages/app/src/app/pages/index.tsx | 2 +- test | 0 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 test diff --git a/packages/app/src/app/overmind/internalActions.ts b/packages/app/src/app/overmind/internalActions.ts index 1c3434a9d6d..37eb3e240a6 100755 --- a/packages/app/src/app/overmind/internalActions.ts +++ b/packages/app/src/app/overmind/internalActions.ts @@ -99,7 +99,7 @@ export const signInGithub: Action< Promise > = ({ effects }, options) => { const authPath = - process.env.LOCAL_SERVER || 'STAGING_BRANCH' in process.env + process.env.LOCAL_SERVER || process.env.STAGING_BRANCH ? '/auth/dev' : `/auth/github${options.useExtraScopes ? '?scope=user:email,repo' : ''}`; diff --git a/packages/app/src/app/pages/index.tsx b/packages/app/src/app/pages/index.tsx index 8247525daf2..02e70c9a2f3 100644 --- a/packages/app/src/app/pages/index.tsx +++ b/packages/app/src/app/pages/index.tsx @@ -112,7 +112,7 @@ const RoutesComponent: React.FC = () => { - {(process.env.LOCAL_SERVER || 'STAGING_BRANCH' in process.env) && ( + {(process.env.LOCAL_SERVER || process.env.STAGING_BRANCH) && ( )} {process.env.NODE_ENV === `development` && ( diff --git a/test b/test deleted file mode 100644 index e69de29bb2d..00000000000 From b622dc3c55ea7c2754bc2fe3debe2d62e70289c4 Mon Sep 17 00:00:00 2001 From: Ives van Hoorne Date: Thu, 17 Oct 2019 11:30:19 +0200 Subject: [PATCH 3/3] Change check --- packages/app/src/app/overmind/internalActions.ts | 2 +- packages/app/src/app/pages/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/app/src/app/overmind/internalActions.ts b/packages/app/src/app/overmind/internalActions.ts index 37eb3e240a6..918bb6d6db2 100755 --- a/packages/app/src/app/overmind/internalActions.ts +++ b/packages/app/src/app/overmind/internalActions.ts @@ -99,7 +99,7 @@ export const signInGithub: Action< Promise > = ({ effects }, options) => { const authPath = - process.env.LOCAL_SERVER || process.env.STAGING_BRANCH + process.env.LOCAL_SERVER || process.env.STAGING ? '/auth/dev' : `/auth/github${options.useExtraScopes ? '?scope=user:email,repo' : ''}`; diff --git a/packages/app/src/app/pages/index.tsx b/packages/app/src/app/pages/index.tsx index 02e70c9a2f3..9d3ae6109bf 100644 --- a/packages/app/src/app/pages/index.tsx +++ b/packages/app/src/app/pages/index.tsx @@ -112,7 +112,7 @@ const RoutesComponent: React.FC = () => { - {(process.env.LOCAL_SERVER || process.env.STAGING_BRANCH) && ( + {(process.env.LOCAL_SERVER || process.env.STAGING) && ( )} {process.env.NODE_ENV === `development` && (