@@ -41,15 +41,21 @@ kubectl get pipeline 2>/dev/null >/dev/null || {
4141RELEASE_BRANCH=" release-${RELEASE_VERSION% .* } .x"
4242
4343git fetch -a --tags ${UPSTREAM_REMOTE} > /dev/null
44- lasttag=$( git tag --sort=-v:refname | grep -E ' ^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -v " ^${RELEASE_VERSION} $" | head -1)
45- [[ -z ${lasttag} ]] && { echo " no previous release tag found for ${RELEASE_VERSION} " ; exit 1; }
4644
4745git ls-remote --exit-code ${UPSTREAM_REMOTE} refs/heads/${RELEASE_BRANCH} > /dev/null 2>&1 && {
48- echo " Patch release detected: ${RELEASE_BRANCH} exists on ${UPSTREAM_REMOTE} , previous tag ${lasttag} "
4946 patch_release=true
50- } || {
51- echo " New release detected: creating ${RELEASE_BRANCH} from ${DEFAULT_BRANCH} , previous tag ${lasttag} "
52- }
47+ } || true
48+
49+ if [[ -n ${patch_release} ]]; then
50+ version_prefix=" ${RELEASE_VERSION% .* } "
51+ prev_tag=$( git tag --sort=-v:refname -l " ${version_prefix} .*" | grep -E ' ^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -v " ^${RELEASE_VERSION} $" | head -1)
52+ [[ -z ${prev_tag} ]] && { echo " no previous patch release tag found for ${version_prefix} " ; exit 1; }
53+ echo " Patch release detected: ${RELEASE_BRANCH} exists on ${UPSTREAM_REMOTE} , previous tag ${prev_tag} "
54+ else
55+ prev_tag=$( git tag --sort=-v:refname | grep -E ' ^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -v " ^${RELEASE_VERSION} $" | head -1)
56+ [[ -z ${prev_tag} ]] && { echo " no previous release tag found for ${RELEASE_VERSION} " ; exit 1; }
57+ echo " New minor release detected: creating ${RELEASE_BRANCH} from ${DEFAULT_BRANCH} , previous tag ${prev_tag} "
58+ fi
5359
5460cd ${GOPATH} /src/github.com/tektoncd/cli
5561
7783 git cherry-pick 052b0b4ce989fe9aee01027e67e61538b48e1179 > /dev/null
7884}
7985
80- if [[ -n ${patch_release} ]]; then
81- version_prefix=" ${RELEASE_VERSION% .* } "
82- prev_tag=$( git tag --sort=-v:refname -l " ${version_prefix} .*" | grep -E ' ^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -v " ^${RELEASE_VERSION} $" | head -1)
83- [[ -z ${prev_tag} ]] && { echo " no previous patch release tag found for ${version_prefix} " ; exit 1; }
84- else
85- prev_tag=${lasttag}
86- fi
87- COMMITS=$( git log --reverse --no-merges \
88- --pretty=format:' %H' HEAD \
89- --since " $( git log --pretty=format:%cd -1 ${prev_tag} ) " )
86+ COMMITS=$( git log --reverse --no-merges --pretty=format:' %H' ${prev_tag} ..HEAD)
87+
88+ echo " Creating changelog for ${RELEASE_VERSION} from ${prev_tag} ..HEAD"
9089
9190changelog=" "
9291for c in ${COMMITS} ; do
0 commit comments