Browse Source

Merge branch 'release/v0.19.x'

dev/WO-783
Tankred Hase 8 years ago
parent
commit
4a43765f70
  1. 12
      .elasticbeanstalk/config.yml
  2. 1
      .gitignore
  3. 8
      Gruntfile.js
  4. 22
      res/aws_release.sh

12
.elasticbeanstalk/config.yml

@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
branch-defaults:
release/prod:
environment: mail-html5-prod
release/test:
environment: mail-html5-test
global:
application_name: mail-html5
default_ec2_keyname: null
default_platform: Node.js
default_region: eu-central-1
profile: eb-cli
sc: git

1
.gitignore vendored

@ -9,7 +9,6 @@ compile/ @@ -9,7 +9,6 @@ compile/
release/
test/integration/src/
src/img/icons/all.svg
.elasticbeanstalk/
test/*/index.js
**/*.browserified.js
**/*.js.map

8
Gruntfile.js

@ -523,7 +523,7 @@ module.exports = function(grunt) { @@ -523,7 +523,7 @@ module.exports = function(grunt) {
});
grunt.registerTask('manifest-test', function() {
if (!version) {
throw new Error('You must specify the version: "--release=1.0"');
throw new Error('You must specify the version: "--release=1.0.0"');
}
patchManifest({
@ -533,9 +533,9 @@ module.exports = function(grunt) { @@ -533,9 +533,9 @@ module.exports = function(grunt) {
deleteKey: true
});
});
grunt.registerTask('manifest-stable', function() {
grunt.registerTask('manifest-prod', function() {
if (!version) {
throw new Error('You must specify the version: "--release=1.0"');
throw new Error('You must specify the version: "--release=1.0.0"');
}
patchManifest({
@ -577,7 +577,7 @@ module.exports = function(grunt) { @@ -577,7 +577,7 @@ module.exports = function(grunt) {
grunt.registerTask('release-dev', ['dist', 'manifest-dev', 'compress']);
grunt.registerTask('release-test', ['dist', 'manifest-test', 'clean:release', 'compress']);
grunt.registerTask('release-stable', ['dist', 'manifest-stable', 'clean:release', 'compress']);
grunt.registerTask('release-prod', ['dist', 'manifest-prod', 'clean:release', 'compress']);
grunt.registerTask('default', ['release-dev']);
};

22
res/aws_release.sh

@ -4,16 +4,22 @@ @@ -4,16 +4,22 @@
cd `dirname $0`
cd ..
if [ "$#" -ne 3 ] || [ "$1" != "prod" ] && [ "$1" != "test" ] ; then
echo 'Usage: ./res/aws_release prod|test from-branch 1.0.0'
exit 0
fi
# switch branch
git checkout aws-dist
git merge master --no-edit
git checkout $2
git branch release/$1
git checkout release/$1
git merge $2 --no-edit
# build and test
rm -rf node_modules/
npm cache clear
npm install
grunt release-$1 --release=$2
grunt test
grunt release-$1 --release=$3
# install only production dependencies
rm -rf node_modules/
@ -26,10 +32,10 @@ find node_modules/ -name ".gitignore" -exec rm -rf {} \; @@ -26,10 +32,10 @@ find node_modules/ -name ".gitignore" -exec rm -rf {} \;
sed -i "" '/dist/d' .gitignore
sed -i "" '/node_modules/d' .gitignore
git add .gitignore node_modules/ dist/
git commit -m "Update aws-dist"
git commit -m "Update release"
# push to aws
git aws.push
eb deploy
# switch back to master branch
git checkout master
# switch back to $2 branch
git checkout $2
Loading…
Cancel
Save