Skip to content

fix(release): fix the release script to find the correct last tag #3319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pratap0007 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(release): fix the release script to find the correct last tag #3319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions tekton/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,32 @@ MINOR_BRANCH="release-${RELEASE_VERSION%.*}.x"

git fetch -a --tags ${UPSTREAM_REMOTE} >/dev/null

git ls-remote --exit-code ${UPSTREAM_REMOTE} refs/heads/${MINOR_BRANCH} >/dev/null 2>&1 && {
patch_release=true
} || true
release_line=$(echo "${RELEASE_VERSION}" | sed -E 's/^v([0-9]+\.[0-9]+)\.[0-9]+$/\1/')

if [[ -n ${patch_release} ]];then
RELEASE_BRANCH="release-${RELEASE_VERSION}"
version_prefix="${RELEASE_VERSION%.*}"
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)
[[ -z ${prev_tag} ]] && { echo "no previous patch release tag found for ${version_prefix}"; exit 1; }
echo "Patch release detected: creating ${RELEASE_BRANCH} from ${MINOR_BRANCH} on ${UPSTREAM_REMOTE}, previous tag ${prev_tag}"
else

lasttag=$(git tag --sort=-v:refname | grep -E "^v${release_line}\.[0-9]+$" | grep -v "^${RELEASE_VERSION}$" | head -1)

# For minor releases (x.y.0), if no tag found in current series, get latest tag overall
if [[ -z ${lasttag} && ${RELEASE_VERSION##*.} -eq 0 ]]; then
lasttag=$(git tag --sort=-v:refname | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$" | grep -Fvx -- "${RELEASE_VERSION}" | head -1)
echo "No previous tag in ${release_line} series, using latest overall tag: ${lasttag}"
fi

[[ -z ${lasttag} ]] && { echo "ERROR: no previous release tag found for ${RELEASE_VERSION}"; exit 1; }

# Determine if patch or minor release based on version number (not branch existence)
PATCH_VERSION="${RELEASE_VERSION##*.}" # Extract the last digit (patch version)

if [[ ${PATCH_VERSION} -eq 0 ]]; then
# Minor release (e.g., v0.47.0) - always create from main
echo "Minor release detected: ${RELEASE_VERSION} - will create ${MINOR_BRANCH} from ${DEFAULT_BRANCH}, previous tag ${lasttag}"
RELEASE_BRANCH="${MINOR_BRANCH}"
prev_tag=$(git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.0$' | grep -v "^${RELEASE_VERSION}$" | head -1)
[[ -z ${prev_tag} ]] && { echo "no previous release tag found for ${RELEASE_VERSION}"; exit 1; }
echo "New minor release detected: creating ${RELEASE_BRANCH} from ${DEFAULT_BRANCH}, previous tag ${prev_tag}"
else
# Patch release (e.g., v0.43.4) - must use existing .x branch
echo "Patch release detected: ${RELEASE_VERSION} - will use existing ${MINOR_BRANCH}, previous tag ${lasttag}"
RELEASE_BRANCH="release-${RELEASE_VERSION}"

patch_release=true
fi

cd ${GOPATH}/src/github.com/tektoncd/cli
Expand Down Expand Up @@ -89,9 +100,9 @@ fi
git cherry-pick 052b0b4ce989fe9aee01027e67e61538b48e1179 >/dev/null
}

COMMITS=$(git log --reverse --no-merges --pretty=format:'%H' ${prev_tag}..HEAD)
COMMITS=$(git log --reverse --no-merges --pretty=format:'%H' ${lasttag}..HEAD)

echo "Creating changelog for ${RELEASE_VERSION} from ${prev_tag}..HEAD"
echo "Creating changelog for ${RELEASE_VERSION} from ${lasttag}..HEAD"

changelog=""
for c in ${COMMITS};do
Expand All @@ -114,7 +125,7 @@ git tag --sign -m \
git push --force ${PUSH_REMOTE} ${RELEASE_VERSION}
git push --force ${PUSH_REMOTE} ${RELEASE_BRANCH}

echo "Checkout to ${DEFAULT_BRANCH} to use the release pipeline"
echo "Checkout to ${DEFAULT_BRANCH} to use the release pipeline of main branch"
git reset --hard ${UPSTREAM_REMOTE}/${DEFAULT_BRANCH}

kubectl create namespace ${TARGET_NAMESPACE} 2>/dev/null || true
Expand Down
Loading