Skip to content

Commit 56ccadd

Browse files
committed
update the script and goreleaser version
Signed-off-by: Shiv Verma <shverma@redhat.com>
1 parent 2f7dce4 commit 56ccadd

2 files changed

Lines changed: 16 additions & 18 deletions

File tree

tekton/release-pipeline.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ spec:
104104
- name: github-token-secret-key
105105
value: $(params.github-token-secret-key)
106106
- name: image
107-
# TODO: update the goreleaser image to latest once go v1.25.6 is supported in latest goreleaser image
108-
value: goreleaser/goreleaser:v2.18.0-ae4debbe-nightly
107+
value: goreleaser/goreleaser:v2.17.1
109108
- name: flags
110109
value: --timeout=60m
111110
workspaces:

tekton/release.sh

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,21 @@ kubectl get pipeline 2>/dev/null >/dev/null || {
4141
RELEASE_BRANCH="release-${RELEASE_VERSION%.*}.x"
4242

4343
git 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

4745
git 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

5460
cd ${GOPATH}/src/github.com/tektoncd/cli
5561

@@ -77,16 +83,9 @@ fi
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

9190
changelog=""
9291
for c in ${COMMITS};do

0 commit comments

Comments
 (0)