Skip to content

Commit 66e4b35

Browse files
Skip fork point build tags -b00 and +0 (adoptium#38)
Signed-off-by: Andrew Leonard <[email protected]>
1 parent 3062e18 commit 66e4b35

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

Diff for: skaraMirror.sh

+12
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ function performMergeIntoReleaseFromMaster() {
123123
fi
124124
done
125125
fi
126+
if [[ "$tag" == *\-b00 ]] || [[ "$tag" == *\+0 ]]; then
127+
echo "Skipping fork point tag $tag from current list"
128+
skipThisTag=true
129+
fi
126130
if [[ "$skipThisTag" == false ]]; then
127131
currentReleaseTag="$tag"
128132
fi
@@ -150,6 +154,10 @@ function performMergeIntoReleaseFromMaster() {
150154
fi
151155
done
152156
fi
157+
if [[ "$tag" == *\-b00 ]] || [[ "$tag" == *\+0 ]]; then
158+
echo "Skipping merge of fork point tag $tag"
159+
mergeTag=false
160+
fi
153161
if [[ "$mergeTag" == true ]]; then
154162
echo "Merging build tag $tag into release branch"
155163
git merge -m"Merging $tag into release" $tag || exit 1
@@ -179,6 +187,10 @@ function performMergeIntoReleaseFromMaster() {
179187
fi
180188
done
181189
fi
190+
if [[ "$tag" == *\-b00 ]] || [[ "$tag" == *\+0 ]]; then
191+
echo "Skipping fork point tag $tag from current list"
192+
skipThisTag=true
193+
fi
182194
if [[ "$skipThisTag" == false ]]; then
183195
prevReleaseTag="${currentReleaseTag}"
184196
currentReleaseTag="$tag"

0 commit comments

Comments
 (0)