Merge branch 'b19.1.2'

scripts/createDocsArchiveBundle.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+if [ "$#" -lt 1 ]
+  then
+    echo "You must supply a release version number"
+    echo "For example: ./scripts/createDocsReleaseBundle.sh 19.1.2"
+    exit 1
+fi
+
+ZIP_PREFIX=`date +%Y%m%d`
+
+RAW_VERSION=$1
+VERSION=""${RAW_VERSION//./}""
+
+cd packages/ag-grid-docs
+gulp release
+cd dist
+
+zip -r -X ../../../archive_"$ZIP_PREFIX"_v"$VERSION".zip *
+
+cd ../../../
+

scripts/createDocsReleaseBundle.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+if [ "$#" -lt 1 ]
+  then
+    echo "You must supply a release version number"
+    echo "For example: ./scripts/createDocsReleaseBundle.sh 19.1.2"
+    exit 1
+fi
+
+ZIP_PREFIX=`date +%Y%m%d`
+
+RAW_VERSION=$1
+VERSION=""${RAW_VERSION//./}""
+
+cd packages/ag-grid-docs
+gulp release
+gulp replace-to-cdn
+cd dist
+
+zip -r -X ../../../release_"$ZIP_PREFIX"_v"$VERSION".zip *
+
+cd ../../../
+

scripts/git-merge-core-branch-into-master.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+if [ "$#" -ne 1 ]
+  then
+    echo "You must supply the source branch that you want to merge"
+    echo "For example git-merge-branch-into-master.sh b19.1.2 will merge changes in b19.1.2 into master"
+    exit 1
+fi
+
+git checkout master
+./scripts/git-merge-one-way.sh $1
+

scripts/git-merge-examples-branch-into-master.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+if [ "$#" -ne 1 ]
+  then
+    echo "You must supply the source branch that you want to merge"
+    echo "For example git-merge-branch-into-master.sh b19.1.2 will merge changes in b19.1.2 into master"
+    exit 1
+fi
+
+examples=(ag-grid-angular-cli-example ag-grid-aurelia-example ag-grid-react-example ag-grid-vue-example)
+
+pwd
+for example in ${examples[@]}; do
+    echo $example
+    cd "packages/$example"
+
+    git checkout master
+    ../../scripts/git-merge-one-way.sh $1
+    cd ../..
+done
+

scripts/git-merge-one-way.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+if [ "$#" -ne 1 ]
+  then
+    echo "You must supply the source branch that you want to merge"
+    echo "For example if you're in master then git-merge-core-one-way.sh b19.1.2 will merge changes in b19.1.2 into master"
+    exit 1
+fi
+
+current_branch=$(git rev-parse --abbrev-ref HEAD)
+echo "Merging $current_branch into $1"
+git stash
+git pull
+git checkout $1
+git pull
+git checkout $current_branch
+git merge $1 --no-commit --no-ff --strategy-option theirs
+git stash apply