-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: 自动升级分支版本号，完成git flow version的逻辑步骤
- Loading branch information
Showing
2 changed files
with
238 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,171 @@ | ||
| <mxfile host="Electron" modified="2022-05-30T12:39:19.874Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/13.6.2 Chrome/83.0.4103.122 Electron/9.2.0 Safari/537.36" etag="PycqOAuGh7zkGw8x9QnV" version="13.6.2" type="device"><diagram id="p1MARaqlvG9aqOaZrADo" name="Page-1">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</diagram></mxfile> | ||
| <mxfile host="65bd71144e"> | ||
| <diagram id="p1MARaqlvG9aqOaZrADo" name="Page-1"> | ||
| <mxGraphModel dx="756" dy="567" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0"> | ||
| <root> | ||
| <mxCell id="0"/> | ||
| <mxCell id="1" parent="0"/> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-4" value="情况一： 远程没有最新发布分支，在本地主动生成一个版本分支" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;" parent="1" vertex="1"> | ||
| <mxGeometry x="580" y="110" width="509" height="207" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-18" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-1" target="DFjBzyQnlfqPb-v60dS5-4" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-1" value="获取远程发布分支列表" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"> | ||
| <mxGeometry x="277.5" y="200" width="202.5" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-17" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-2" target="DFjBzyQnlfqPb-v60dS5-1" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-2" value="Start" style="ellipse;shape=doubleEllipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" parent="1" vertex="1"> | ||
| <mxGeometry x="358.75" y="120" width="40" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-19" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-4" target="DFjBzyQnlfqPb-v60dS5-5" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-4" value="获取远程最新发布分支号" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"> | ||
| <mxGeometry x="277.5" y="280" width="202.5" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-20" value="不存在" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="DFjBzyQnlfqPb-v60dS5-5" target="DFjBzyQnlfqPb-v60dS5-7" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-21" value="存在" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-5" target="DFjBzyQnlfqPb-v60dS5-6" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-5" value="最新发布版本号<br>是否存在" style="rhombus;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1"> | ||
| <mxGeometry x="278.75" y="360" width="200" height="60" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-22" value="小于" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-6" target="DFjBzyQnlfqPb-v60dS5-9" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-26" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="DFjBzyQnlfqPb-v60dS5-6" target="DFjBzyQnlfqPb-v60dS5-12" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"> | ||
| <Array as="points"> | ||
| <mxPoint x="499" y="510"/> | ||
| <mxPoint x="499" y="860"/> | ||
| </Array> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-1" value="大于" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="DFjBzyQnlfqPb-v60dS5-26" vertex="1" connectable="0"> | ||
| <mxGeometry x="-0.3122" y="1" relative="1" as="geometry"> | ||
| <mxPoint as="offset"/> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-6" value="本地分支是否大于远程<br>分支版本号" style="rhombus;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="1" vertex="1"> | ||
| <mxGeometry x="278.5" y="480" width="200" height="60" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="1" source="DFjBzyQnlfqPb-v60dS5-7" target="DFjBzyQnlfqPb-v60dS5-11" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"> | ||
| <Array as="points"> | ||
| <mxPoint x="121" y="780"/> | ||
| </Array> | ||
| </mxGeometry> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-7" value="获取远程最新发布分支号" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"> | ||
| <mxGeometry x="40" y="440" width="162.5" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-23" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-9" target="DFjBzyQnlfqPb-v60dS5-10" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-9" value="用户选择升级版本号模式<br>major/minor/patch" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"> | ||
| <mxGeometry x="277.25" y="600" width="202.5" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-24" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-10" target="DFjBzyQnlfqPb-v60dS5-11" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-10" value="获取升级后的<br>本地开发分支号" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"> | ||
| <mxGeometry x="277.5" y="680" width="202.5" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-25" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="DFjBzyQnlfqPb-v60dS5-11" target="DFjBzyQnlfqPb-v60dS5-12" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-11" value="获取升级后的版本号写入package.json" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=#d6b656;" parent="1" vertex="1"> | ||
| <mxGeometry x="277.25" y="760" width="202.5" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="DFjBzyQnlfqPb-v60dS5-12" value="end" style="ellipse;shape=doubleEllipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" vertex="1"> | ||
| <mxGeometry x="358.75" y="840" width="40" height="40" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-3" target="QV39Lm6rksdgxyd1rdHf-5" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-3" target="QV39Lm6rksdgxyd1rdHf-6" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-3" target="QV39Lm6rksdgxyd1rdHf-7" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-3" value="major/1.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="688" y="186" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-5" value="major/2.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="592" y="263" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-6" value="minor/1.1.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="688" y="263" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-7" value="patch/1.0.1" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="784" y="263" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-8" value="版本规范<br>major/minor/patch" style="shape=document;whiteSpace=wrap;html=1;boundedLbl=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="596" y="141" width="87" height="48" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-14" value="master" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="957" y="189" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-16" value="情况二： 远程存在最新的发布分支 （提供选择major/minor/patch）" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;" parent="1" vertex="1"> | ||
| <mxGeometry x="580" y="356.5" width="509" height="207" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-19" target="QV39Lm6rksdgxyd1rdHf-20" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-19" target="QV39Lm6rksdgxyd1rdHf-22" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-19" target="QV39Lm6rksdgxyd1rdHf-24" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-19" value="major/1.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="690" y="441" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-20" value="major/2.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="594" y="518" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-21" value="minor/1.1.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="690" y="518" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-22" value="patch/1.0.1" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="786" y="518" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-23" value="版本规范<br>major/minor/patch" style="shape=document;whiteSpace=wrap;html=1;boundedLbl=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="598" y="396" width="87" height="48" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-24" value="master<br>release/1.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="957" y="441" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-26" value="情况三： 本地分支大于远程分支" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;" parent="1" vertex="1"> | ||
| <mxGeometry x="580" y="585" width="509" height="121" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-29" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-27" target="QV39Lm6rksdgxyd1rdHf-28" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-27" value="dev/1.1.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="604" y="643" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-28" value="master<br>release/1.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="943" y="643" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-30" value="情况四： 本地分支小于远程分支 （进行分支升级）" style="rounded=0;whiteSpace=wrap;html=1;align=left;verticalAlign=top;" parent="1" vertex="1"> | ||
| <mxGeometry x="580" y="733" width="509" height="121" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="QV39Lm6rksdgxyd1rdHf-32" target="QV39Lm6rksdgxyd1rdHf-33" edge="1"> | ||
| <mxGeometry relative="1" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-32" value="dev/1.0.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="604" y="791" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| <mxCell id="QV39Lm6rksdgxyd1rdHf-33" value="master<br>release/1.1.0" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> | ||
| <mxGeometry x="943" y="791" width="81" height="30" as="geometry"/> | ||
| </mxCell> | ||
| </root> | ||
| </mxGraphModel> | ||
| </diagram> | ||
| </mxfile> |
Oops, something went wrong.