From 8b0b6c4b6a1583fe47a94cb7cc86ae377de78efc Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Wed, 3 May 2017 10:21:50 -0400 Subject: [PATCH 1/5] Add support for Ember canary to addon builder. --- addon-build-configs/canary/bower.json | 10 +++++++ addon-build-configs/canary/package.json | 38 +++++++++++++++++++++++++ config/staging.js | 3 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 addon-build-configs/canary/bower.json create mode 100644 addon-build-configs/canary/package.json diff --git a/addon-build-configs/canary/bower.json b/addon-build-configs/canary/bower.json new file mode 100644 index 0000000..e6da182 --- /dev/null +++ b/addon-build-configs/canary/bower.json @@ -0,0 +1,10 @@ +{ + "name": "twiddle", + "dependencies": { + "ember": "canary", + "jquery": "^1.11.1" + }, + "resolutions": { + "ember": "canary" + } +} diff --git a/addon-build-configs/canary/package.json b/addon-build-configs/canary/package.json new file mode 100644 index 0000000..476f42b --- /dev/null +++ b/addon-build-configs/canary/package.json @@ -0,0 +1,38 @@ +{ + "name": "twiddle", + "version": "0.0.0", + "description": "Small description for addon-builder-canary goes here", + "private": true, + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "start": "ember server", + "build": "ember build", + "test": "ember test" + }, + "repository": "", + "engines": { + "node": ">= 4" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "broccoli-asset-rev": "^2.4.5", + "ember-cli": "2.13.0", + "ember-cli-babel": "^6.0.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.4.0", + "ember-cli-uglify": "^1.2.0", + "ember-load-initializers": "^1.0.0", + "ember-resolver": "^4.0.0", + "loader.js": "^4.2.3", + + "broccoli-funnel": "^1.0.7", + "broccoli-concat": "^3.2.2", + "aws-sdk": "2.4", + "s3": "4.4.0", + "quick-temp": "0.1.6" + } +} diff --git a/config/staging.js b/config/staging.js index 58940ef..37a3d1d 100644 --- a/config/staging.js +++ b/config/staging.js @@ -23,6 +23,7 @@ module.exports = { '2.10.0': /2\.10\.0/, '2.10.1': /2\.10\./, '2.11.0': /2\.11\./, - '2.12.0': /2\.12\./ + '2.12.0': /2\.12\./, + 'canary': /^canary$/ } }; From 3865ac791b77f069269bd4f7a339cd1814a0c517 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Wed, 3 May 2017 10:23:58 -0400 Subject: [PATCH 2/5] Add beta to addon builder. --- addon-build-configs/beta/bower.json | 10 +++++++ addon-build-configs/beta/package.json | 38 +++++++++++++++++++++++++++ config/staging.js | 3 ++- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 addon-build-configs/beta/bower.json create mode 100644 addon-build-configs/beta/package.json diff --git a/addon-build-configs/beta/bower.json b/addon-build-configs/beta/bower.json new file mode 100644 index 0000000..6f296ba --- /dev/null +++ b/addon-build-configs/beta/bower.json @@ -0,0 +1,10 @@ +{ + "name": "twiddle", + "dependencies": { + "ember": "beta", + "jquery": "^1.11.1" + }, + "resolutions": { + "ember": "beta" + } +} diff --git a/addon-build-configs/beta/package.json b/addon-build-configs/beta/package.json new file mode 100644 index 0000000..476f42b --- /dev/null +++ b/addon-build-configs/beta/package.json @@ -0,0 +1,38 @@ +{ + "name": "twiddle", + "version": "0.0.0", + "description": "Small description for addon-builder-canary goes here", + "private": true, + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "start": "ember server", + "build": "ember build", + "test": "ember test" + }, + "repository": "", + "engines": { + "node": ">= 4" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "broccoli-asset-rev": "^2.4.5", + "ember-cli": "2.13.0", + "ember-cli-babel": "^6.0.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.4.0", + "ember-cli-uglify": "^1.2.0", + "ember-load-initializers": "^1.0.0", + "ember-resolver": "^4.0.0", + "loader.js": "^4.2.3", + + "broccoli-funnel": "^1.0.7", + "broccoli-concat": "^3.2.2", + "aws-sdk": "2.4", + "s3": "4.4.0", + "quick-temp": "0.1.6" + } +} diff --git a/config/staging.js b/config/staging.js index 37a3d1d..3271f03 100644 --- a/config/staging.js +++ b/config/staging.js @@ -24,6 +24,7 @@ module.exports = { '2.10.1': /2\.10\./, '2.11.0': /2\.11\./, '2.12.0': /2\.12\./, - 'canary': /^canary$/ + 'canary': /^canary$/, + 'beta': /^beta$/ } }; From 698a84dc5cf936e9f9a55ea6ef3113644e7a1c1d Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Wed, 3 May 2017 10:25:40 -0400 Subject: [PATCH 3/5] Add support for Ember release channel to addon builder. --- addon-build-configs/release/bower.json | 10 +++++++ addon-build-configs/release/package.json | 38 ++++++++++++++++++++++++ config/staging.js | 3 +- 3 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 addon-build-configs/release/bower.json create mode 100644 addon-build-configs/release/package.json diff --git a/addon-build-configs/release/bower.json b/addon-build-configs/release/bower.json new file mode 100644 index 0000000..db90cb6 --- /dev/null +++ b/addon-build-configs/release/bower.json @@ -0,0 +1,10 @@ +{ + "name": "twiddle", + "dependencies": { + "ember": "release", + "jquery": "^1.11.1" + }, + "resolutions": { + "ember": "release" + } +} diff --git a/addon-build-configs/release/package.json b/addon-build-configs/release/package.json new file mode 100644 index 0000000..476f42b --- /dev/null +++ b/addon-build-configs/release/package.json @@ -0,0 +1,38 @@ +{ + "name": "twiddle", + "version": "0.0.0", + "description": "Small description for addon-builder-canary goes here", + "private": true, + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "start": "ember server", + "build": "ember build", + "test": "ember test" + }, + "repository": "", + "engines": { + "node": ">= 4" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "broccoli-asset-rev": "^2.4.5", + "ember-cli": "2.13.0", + "ember-cli-babel": "^6.0.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.4.0", + "ember-cli-uglify": "^1.2.0", + "ember-load-initializers": "^1.0.0", + "ember-resolver": "^4.0.0", + "loader.js": "^4.2.3", + + "broccoli-funnel": "^1.0.7", + "broccoli-concat": "^3.2.2", + "aws-sdk": "2.4", + "s3": "4.4.0", + "quick-temp": "0.1.6" + } +} diff --git a/config/staging.js b/config/staging.js index 3271f03..805e133 100644 --- a/config/staging.js +++ b/config/staging.js @@ -25,6 +25,7 @@ module.exports = { '2.11.0': /2\.11\./, '2.12.0': /2\.12\./, 'canary': /^canary$/, - 'beta': /^beta$/ + 'beta': /^beta$/, + 'release': /^release$/ } }; From a2643785877eb551a40c287b8c51d3faf0551ff8 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Wed, 3 May 2017 10:26:53 -0400 Subject: [PATCH 4/5] Add support for Ember alpha channel to addon builder. --- addon-build-configs/alpha/bower.json | 10 +++++++ addon-build-configs/alpha/package.json | 38 ++++++++++++++++++++++++++ config/staging.js | 1 + 3 files changed, 49 insertions(+) create mode 100644 addon-build-configs/alpha/bower.json create mode 100644 addon-build-configs/alpha/package.json diff --git a/addon-build-configs/alpha/bower.json b/addon-build-configs/alpha/bower.json new file mode 100644 index 0000000..3d2dcbf --- /dev/null +++ b/addon-build-configs/alpha/bower.json @@ -0,0 +1,10 @@ +{ + "name": "twiddle", + "dependencies": { + "ember": "alpha", + "jquery": "^1.11.1" + }, + "resolutions": { + "ember": "alpha" + } +} diff --git a/addon-build-configs/alpha/package.json b/addon-build-configs/alpha/package.json new file mode 100644 index 0000000..476f42b --- /dev/null +++ b/addon-build-configs/alpha/package.json @@ -0,0 +1,38 @@ +{ + "name": "twiddle", + "version": "0.0.0", + "description": "Small description for addon-builder-canary goes here", + "private": true, + "directories": { + "doc": "doc", + "test": "tests" + }, + "scripts": { + "start": "ember server", + "build": "ember build", + "test": "ember test" + }, + "repository": "", + "engines": { + "node": ">= 4" + }, + "author": "", + "license": "MIT", + "devDependencies": { + "broccoli-asset-rev": "^2.4.5", + "ember-cli": "2.13.0", + "ember-cli-babel": "^6.0.0", + "ember-cli-htmlbars": "^1.1.1", + "ember-cli-htmlbars-inline-precompile": "^0.4.0", + "ember-cli-uglify": "^1.2.0", + "ember-load-initializers": "^1.0.0", + "ember-resolver": "^4.0.0", + "loader.js": "^4.2.3", + + "broccoli-funnel": "^1.0.7", + "broccoli-concat": "^3.2.2", + "aws-sdk": "2.4", + "s3": "4.4.0", + "quick-temp": "0.1.6" + } +} diff --git a/config/staging.js b/config/staging.js index 805e133..7d62033 100644 --- a/config/staging.js +++ b/config/staging.js @@ -24,6 +24,7 @@ module.exports = { '2.10.1': /2\.10\./, '2.11.0': /2\.11\./, '2.12.0': /2\.12\./, + 'alpha': /^alpha$/, 'canary': /^canary$/, 'beta': /^beta$/, 'release': /^release$/ From 1287bbf15b3c9be1e2760c32dd82f1bc51ac69de Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Wed, 3 May 2017 10:36:58 -0400 Subject: [PATCH 5/5] Support rolling versions of canary / release / beta. --- addon-build-configs/{alpha => alpha-2.15}/bower.json | 0 .../{alpha => alpha-2.15}/package.json | 0 addon-build-configs/{beta => beta-2.14}/bower.json | 0 addon-build-configs/{beta => beta-2.14}/package.json | 0 .../{canary => canary-2.15}/bower.json | 0 .../{canary => canary-2.15}/package.json | 0 .../{release => release-2.13}/bower.json | 0 .../{release => release-2.13}/package.json | 0 config/staging.js | 12 ++++++++---- 9 files changed, 8 insertions(+), 4 deletions(-) rename addon-build-configs/{alpha => alpha-2.15}/bower.json (100%) rename addon-build-configs/{alpha => alpha-2.15}/package.json (100%) rename addon-build-configs/{beta => beta-2.14}/bower.json (100%) rename addon-build-configs/{beta => beta-2.14}/package.json (100%) rename addon-build-configs/{canary => canary-2.15}/bower.json (100%) rename addon-build-configs/{canary => canary-2.15}/package.json (100%) rename addon-build-configs/{release => release-2.13}/bower.json (100%) rename addon-build-configs/{release => release-2.13}/package.json (100%) diff --git a/addon-build-configs/alpha/bower.json b/addon-build-configs/alpha-2.15/bower.json similarity index 100% rename from addon-build-configs/alpha/bower.json rename to addon-build-configs/alpha-2.15/bower.json diff --git a/addon-build-configs/alpha/package.json b/addon-build-configs/alpha-2.15/package.json similarity index 100% rename from addon-build-configs/alpha/package.json rename to addon-build-configs/alpha-2.15/package.json diff --git a/addon-build-configs/beta/bower.json b/addon-build-configs/beta-2.14/bower.json similarity index 100% rename from addon-build-configs/beta/bower.json rename to addon-build-configs/beta-2.14/bower.json diff --git a/addon-build-configs/beta/package.json b/addon-build-configs/beta-2.14/package.json similarity index 100% rename from addon-build-configs/beta/package.json rename to addon-build-configs/beta-2.14/package.json diff --git a/addon-build-configs/canary/bower.json b/addon-build-configs/canary-2.15/bower.json similarity index 100% rename from addon-build-configs/canary/bower.json rename to addon-build-configs/canary-2.15/bower.json diff --git a/addon-build-configs/canary/package.json b/addon-build-configs/canary-2.15/package.json similarity index 100% rename from addon-build-configs/canary/package.json rename to addon-build-configs/canary-2.15/package.json diff --git a/addon-build-configs/release/bower.json b/addon-build-configs/release-2.13/bower.json similarity index 100% rename from addon-build-configs/release/bower.json rename to addon-build-configs/release-2.13/bower.json diff --git a/addon-build-configs/release/package.json b/addon-build-configs/release-2.13/package.json similarity index 100% rename from addon-build-configs/release/package.json rename to addon-build-configs/release-2.13/package.json diff --git a/config/staging.js b/config/staging.js index 7d62033..5f9886b 100644 --- a/config/staging.js +++ b/config/staging.js @@ -24,9 +24,13 @@ module.exports = { '2.10.1': /2\.10\./, '2.11.0': /2\.11\./, '2.12.0': /2\.12\./, - 'alpha': /^alpha$/, - 'canary': /^canary$/, - 'beta': /^beta$/, - 'release': /^release$/ + + // support multiple canary / beta / release cycles + // by tying them to a specific Ember version at + // the time of deployment + 'alpha-2.15': /^alpha$/, + 'canary-2.15': /^canary$/, + 'beta-2.14': /^beta$/, + 'release-2-13': /^release$/ } };