File tree 1 file changed +12
-0
lines changed
1 file changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -123,6 +123,10 @@ function performMergeIntoReleaseFromMaster() {
123
123
fi
124
124
done
125
125
fi
126
+ if [[ " $tag " == * \- b00 ]] || [[ " $tag " == * \+ 0 ]]; then
127
+ echo " Skipping fork point tag $tag from current list"
128
+ skipThisTag=true
129
+ fi
126
130
if [[ " $skipThisTag " == false ]]; then
127
131
currentReleaseTag=" $tag "
128
132
fi
@@ -150,6 +154,10 @@ function performMergeIntoReleaseFromMaster() {
150
154
fi
151
155
done
152
156
fi
157
+ if [[ " $tag " == * \- b00 ]] || [[ " $tag " == * \+ 0 ]]; then
158
+ echo " Skipping merge of fork point tag $tag "
159
+ mergeTag=false
160
+ fi
153
161
if [[ " $mergeTag " == true ]]; then
154
162
echo " Merging build tag $tag into release branch"
155
163
git merge -m" Merging $tag into release" $tag || exit 1
@@ -179,6 +187,10 @@ function performMergeIntoReleaseFromMaster() {
179
187
fi
180
188
done
181
189
fi
190
+ if [[ " $tag " == * \- b00 ]] || [[ " $tag " == * \+ 0 ]]; then
191
+ echo " Skipping fork point tag $tag from current list"
192
+ skipThisTag=true
193
+ fi
182
194
if [[ " $skipThisTag " == false ]]; then
183
195
prevReleaseTag=" ${currentReleaseTag} "
184
196
currentReleaseTag=" $tag "
You can’t perform that action at this time.
0 commit comments