asandikci.com/web
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

chore(build): tag on production branch instead of master (#1052)

Browse source
This commit is contained in:
Cotes Chung 2023-05-20 00:35:11 +08:00 committed by GitHub
parent a51d31c55a
commit 98850e1e5d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/release
View file

@ -164,15 +164,14 @@ build_gem() {
release() { release() {
_version="$1" # X.Y.Z _version="$1" # X.Y.Z
git checkout "$PROD_BRANCH"
git merge --no-ff --no-edit "$working_branch"
# Create a new tag on working branch # Create a new tag on working branch
echo -e "Create tag v$_version\n" echo -e "Create tag v$_version\n"
git tag "v$_version" git tag "v$_version"
git checkout "$PROD_BRANCH" # Merge from patch branch to the staging branch
git merge --no-ff --no-edit "$working_branch"
# merge from patch branch to the staging branch
# NOTE: This may break due to merge conflicts, so it may need to be resolved manually.
if [[ $working_branch == hotfix/* ]]; then if [[ $working_branch == hotfix/* ]]; then
git checkout "$STAGING_BRANCH" git checkout "$STAGING_BRANCH"
git merge --no-ff --no-edit "$working_branch" git merge --no-ff --no-edit "$working_branch"