diff --git a/bump_release_version.sh b/bump_release_version.sh new file mode 100755 index 0000000..fc69cf7 --- /dev/null +++ b/bump_release_version.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +# Check branch +check_branch $branch +forall_repos check_branch $branch + +# Ensure clean git state +forall_repos check_clean_git + +bump_release_version + +popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh new file mode 100755 index 0000000..35c3efc --- /dev/null +++ b/bump_test_version.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +# Check branch +check_branch $branch +forall_repos check_branch $branch + +# Ensure clean git state +forall_repos check_clean_git + +bump_test_version + +popd > /dev/null diff --git a/merge_helpers.sh b/merge_helpers.sh index 4cceec1..fd3a0c7 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -2,6 +2,8 @@ SCHILDI_ROOT="$(dirname "$(realpath "$0")")" +branch=${BRANCH:-"sc"} + i18n_helper_path="$SCHILDI_ROOT/i18n-helper/index.js" i18n_path="src/i18n/strings" i18n_overlay_path="$SCHILDI_ROOT/i18n-overlays" diff --git a/merge_upstream.sh b/merge_upstream.sh index fb876b9..5fba6ec 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -3,7 +3,6 @@ set -e mydir="$(dirname "$(realpath "$0")")" -branch=${BRANCH:-"sc"} pushd "$mydir" > /dev/null diff --git a/publish_release.sh b/publish_release.sh new file mode 100755 index 0000000..cd5874c --- /dev/null +++ b/publish_release.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +# Check branch +check_branch $branch +forall_repos check_branch $branch + +# Ensure clean git state +forall_repos check_clean_git + +git fetch origin +git branch -D master || true +git checkout -b master --track origin/master +git merge --ff-only sc +git push +git checkout sc +forall_repos git fetch origin +forall_repos git branch -D master || true +forall_repos git checkout -b master --track origin/master +forall_repos git merge --ff-only sc +forall_repos git push +forall_repos git checkout sc + +popd > /dev/null