diff options
| author | Sam Potts <sam@potts.es> | 2019-01-29 21:37:06 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2019-01-29 21:37:06 +1100 |
| commit | d0e3c7c6d00d66ea2dc8533e68aa0af0ca952d1d (patch) | |
| tree | 22fa1fb962223420862f6efb6df29d0aeae25551 | |
| parent | b1da599b5d5891dc1dca44bd6aa9d8d03872fdcb (diff) | |
| parent | d9daf2c618dd6f8ad267b7e4ad347b949e55c741 (diff) | |
| download | plyr-d0e3c7c6d00d66ea2dc8533e68aa0af0ca952d1d.tar.lz plyr-d0e3c7c6d00d66ea2dc8533e68aa0af0ca952d1d.tar.xz plyr-d0e3c7c6d00d66ea2dc8533e68aa0af0ca952d1d.zip | |
Merge branch 'develop' into beta
| -rw-r--r-- | gulpfile.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gulpfile.js b/gulpfile.js index b536662b..50eeb028 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -246,7 +246,7 @@ if (Object.keys(credentials).includes('aws') && Object.keys(credentials).include const branch = { current: gitbranch.sync(), master: 'master', - develop: 'develop', + beta: 'beta', }; const maxAge = 31536000; // 1 year @@ -258,7 +258,7 @@ if (Object.keys(credentials).includes('aws') && Object.keys(credentials).include }, }, demo: { - uploadPath: branch.current === branch.develop ? 'beta/' : null, + uploadPath: branch.current === branch.beta ? 'beta/' : null, headers: { 'Cache-Control': 'no-cache, no-store, must-revalidate, max-age=0', Vary: 'Accept-Encoding', @@ -289,7 +289,7 @@ if (Object.keys(credentials).includes('aws') && Object.keys(credentials).include // Check we're on the correct branch to deploy const canDeploy = () => { - const allowed = [branch.master, branch.develop]; + const allowed = [branch.master, branch.beta]; if (!allowed.includes(branch.current)) { console.error(`Must be on ${allowed.join(', ')} to publish! (current: ${branch.current})`); |