mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-05 19:08:18 +00:00
Refactor merge-to-branch.sh and unify-twilight-and-stable.sh scripts
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
set -ex
|
||||
|
||||
actual_default_branch="central"
|
||||
|
||||
branch=zen-"$1"
|
||||
default_branch="central"
|
||||
|
||||
if [ $branch = "zen-stable" ]; then
|
||||
default_branch="zen-twilight"
|
||||
fi
|
||||
|
||||
git checkout "$branch"
|
||||
git merge "$default_branch"
|
||||
git push origin "$branch"
|
||||
|
||||
git checkout "$actual_default_branch"
|
@@ -1,14 +0,0 @@
|
||||
|
||||
# confirm before doing anything
|
||||
echo "This script will merge the current branch to both the stable and twilight branches."
|
||||
echo "Are you sure you want to continue? (y/n)"
|
||||
read -r response
|
||||
if [ "$response" != "y" ]; then
|
||||
echo "Exiting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
set -ex
|
||||
|
||||
sh $(dirname $0)/merge-to-branch.sh twilight
|
||||
sh $(dirname $0)/merge-to-branch.sh stable
|
Reference in New Issue
Block a user