diff --git a/packages/ag-grid-angular-cli-example b/packages/ag-grid-angular-cli-example index 5441aab1493..e23a39d9c4d 160000 --- a/packages/ag-grid-angular-cli-example +++ b/packages/ag-grid-angular-cli-example @@ -1 +1 @@ -Subproject commit 5441aab14936160282fd4d31ce7cd2ee7ef1feb2 +Subproject commit e23a39d9c4dc390b5e7df0e2560051f3e42b9e2c diff --git a/packages/ag-grid-aurelia-example b/packages/ag-grid-aurelia-example index bd5fe8fab97..bac16dc98f2 160000 --- a/packages/ag-grid-aurelia-example +++ b/packages/ag-grid-aurelia-example @@ -1 +1 @@ -Subproject commit bd5fe8fab974e7c3f700621bd79a0f826547f133 +Subproject commit bac16dc98f28156472c6bb7cbe4cae178b3c1d03 diff --git a/packages/ag-grid-polymer-example b/packages/ag-grid-polymer-example index bb495421c2f..273d032dbef 160000 --- a/packages/ag-grid-polymer-example +++ b/packages/ag-grid-polymer-example @@ -1 +1 @@ -Subproject commit bb495421c2f78de8c061e58bd10044d6a732df75 +Subproject commit 273d032dbef7874a8bee24142d379bae7d33971e diff --git a/packages/ag-grid-react-example b/packages/ag-grid-react-example index 2b6e3e8f41c..58df719d45c 160000 --- a/packages/ag-grid-react-example +++ b/packages/ag-grid-react-example @@ -1 +1 @@ -Subproject commit 2b6e3e8f41c6a0324aa8085efd86f48371c376b4 +Subproject commit 58df719d45cddf199235989159c6568e36af7c3d diff --git a/packages/ag-grid-vue-example b/packages/ag-grid-vue-example index b72293e27fa..a529fe5bd81 160000 --- a/packages/ag-grid-vue-example +++ b/packages/ag-grid-vue-example @@ -1 +1 @@ -Subproject commit b72293e27fa338518f2b7355c5e1906e36b3f4f9 +Subproject commit a529fe5bd81f4089cfcf3550e4f2ddf30af36db7 diff --git a/scripts/createDocsArchiveBundle.sh b/scripts/createDocsArchiveBundle.sh new file mode 100755 index 00000000000..8311d069430 --- /dev/null +++ b/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 ../../../ + diff --git a/scripts/createDocsReleaseBundle.sh b/scripts/createDocsReleaseBundle.sh new file mode 100755 index 00000000000..792d4861942 --- /dev/null +++ b/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 ../../../ + diff --git a/scripts/git-merge-core-branch-into-master.sh b/scripts/git-merge-core-branch-into-master.sh new file mode 100644 index 00000000000..2b0530d9b4a --- /dev/null +++ b/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 + diff --git a/scripts/git-merge-examples-branch-into-master.sh b/scripts/git-merge-examples-branch-into-master.sh new file mode 100755 index 00000000000..94e022e3fce --- /dev/null +++ b/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 + diff --git a/scripts/git-merge-one-way.sh b/scripts/git-merge-one-way.sh new file mode 100755 index 00000000000..3e6ec11eb39 --- /dev/null +++ b/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