f.weber/jekyll-theme-chirpy
Template
1
0
Fork 0
mirror of https://github.com/cotes2020/jekyll-theme-chirpy.git synced 2025-12-18 13:44:15 +00:00
Code Issues Packages Releases Activity

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
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/release
View File

@@ -164,15 +164,14 @@ build_gem() {
release() {
_version="$1" # X.Y.Z
git checkout "$PROD_BRANCH"
git merge --no-ff --no-edit "$working_branch"
# Create a new tag on working branch
echo -e "Create tag v$_version\n"
git tag "v$_version"
git checkout "$PROD_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.
# Merge from patch branch to the staging branch
if [[ $working_branch == hotfix/* ]]; then
git checkout "$STAGING_BRANCH"
git merge --no-ff --no-edit "$working_branch"