From 50d35374db24cdc8570572c7edb2b3484d21b801 Mon Sep 17 00:00:00 2001 From: CJ Davis Date: Thu, 21 Sep 2017 11:46:53 -0400 Subject: [PATCH] fix(publisher): allow config for Electron Release Server to be read from envars --- src/util/forge-config.js | 1 + test/fast/forge-config_spec.js | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/util/forge-config.js b/src/util/forge-config.js index a897ed4b5b..785401f573 100644 --- a/src/util/forge-config.js +++ b/src/util/forge-config.js @@ -50,6 +50,7 @@ export default async (dir) => { electronInstallerRedhat: {}, s3: {}, github_repository: {}, + electronReleaseServer: {}, }, forgeConfig); forgeConfig.make_targets = Object.assign({ win32: ['squirrel'], diff --git a/test/fast/forge-config_spec.js b/test/fast/forge-config_spec.js index f120b4d0b6..d617e67de9 100644 --- a/test/fast/forge-config_spec.js +++ b/test/fast/forge-config_spec.js @@ -23,6 +23,7 @@ const defaults = { }, github_repository: {}, s3: {}, + electronReleaseServer: {}, }; describe('forge-config', () => { @@ -54,7 +55,10 @@ describe('forge-config', () => { expect(conf.s3.secretAccessKey).to.equal(undefined); process.env.ELECTRON_FORGE_S3_SECRET_ACCESS_KEY = 'SecretyThing'; + process.env.ELECTRON_FORGE_ELECTRON_RELEASE_SERVER_BASE_URL = 'http://example.com'; expect(conf.s3.secretAccessKey).to.equal('SecretyThing'); + expect(conf.electronReleaseServer.baseUrl).to.equal('http://example.com'); delete process.env.ELECTRON_FORGE_S3_SECRET_ACCESS_KEY; + delete process.env.ELECTRON_FORGE_ELECTRON_RELEASE_SERVER_BASE_URL; }); });