1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-08 01:19:59 +02:00

Refactor merge-to-branch.sh and unify-twilight-and-stable.sh scripts

This commit is contained in:
mr. M 2024-10-12 18:34:21 +02:00
parent 40223ee48a
commit b9f392da94
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
2 changed files with 0 additions and 30 deletions

View file

@ -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"

View file

@ -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