Skip to content

fix(release): improve previous tag detection and use stable goreleaser image #3070

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
+32 −23
Open

fix(release): improve previous tag detection and use stable goreleaser image #3070

Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions tekton/release-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ spec:
- name: github-token-secret-key
value: $(params.github-token-secret-key)
- name: image
# TODO: update the goreleaser image to latest once go v1.25.6 is supported in latest goreleaser image
value: goreleaser/goreleaser:v2.18.0-ae4debbe-nightly
value: goreleaser/goreleaser:v2.17.1
- name: flags
value: --timeout=60m
workspaces:
Expand Down
52 changes: 31 additions & 21 deletions tekton/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ CATALOG_TASKS="lint build test"

BINARIES="kubectl jq tkn git"

GOLANGCI_VERSION="$(cat tools/go.mod | grep golangci-lint | awk '{ print $3 }')"
GOLANGCI_VERSION="$(grep -A2 'golangci-lint' .github/workflows/ci.yaml | grep 'version:' | awk '{ print $2 }')"
[[ -z ${GOLANGCI_VERSION} ]] && {
echo "WARNING: unable to detect golangci-lint version from .github/workflows/ci.yaml, using 'latest'"
GOLANGCI_VERSION="latest"
}
GO_VERSION="$(cat go.mod | grep "go" | awk 'NR==1{ print $2 }')"

set -e
Expand All @@ -38,18 +42,26 @@ kubectl get pipeline 2>/dev/null >/dev/null || {

[[ ${RELEASE_VERSION} =~ v[0-9]+\.[0-9]*\.[0-9]+ ]] || { echo "invalid version provided, need to match v\d+\.\d+\.\d+"; exit 1 ;}

RELEASE_BRANCH="release-${RELEASE_VERSION%.*}.x"
MINOR_BRANCH="release-${RELEASE_VERSION%.*}.x"

git fetch -a --tags ${UPSTREAM_REMOTE} >/dev/null
lasttag=$(git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | grep -v "^${RELEASE_VERSION}$" | head -1)
[[ -z ${lasttag} ]] && { echo "no previous release tag found for ${RELEASE_VERSION}"; exit 1; }

git ls-remote --exit-code ${UPSTREAM_REMOTE} refs/heads/${RELEASE_BRANCH} >/dev/null 2>&1 && {
echo "Patch release detected: ${RELEASE_BRANCH} exists on ${UPSTREAM_REMOTE}, previous tag ${lasttag}"
git ls-remote --exit-code ${UPSTREAM_REMOTE} refs/heads/${MINOR_BRANCH} >/dev/null 2>&1 && {
patch_release=true
} || {
echo "New release detected: creating ${RELEASE_BRANCH} from ${DEFAULT_BRANCH}, previous tag ${lasttag}"
}
} || true

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
RELEASE_BRANCH="${MINOR_BRANCH}"
prev_tag=$(git tag --sort=-v:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | 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}"
fi

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

Expand All @@ -60,8 +72,8 @@ cd ${GOPATH}/src/github.com/tektoncd/cli
}

if [[ -n ${patch_release} ]];then
echo "Checking out existing ${RELEASE_BRANCH} from ${UPSTREAM_REMOTE}"
git checkout -B ${RELEASE_BRANCH} ${UPSTREAM_REMOTE}/${RELEASE_BRANCH} >/dev/null
echo "Creating ${RELEASE_BRANCH} from ${UPSTREAM_REMOTE}/${MINOR_BRANCH}"
git checkout -B ${RELEASE_BRANCH} ${UPSTREAM_REMOTE}/${MINOR_BRANCH} >/dev/null
else
echo "New release ${RELEASE_VERSION%.*} detected: creating ${RELEASE_BRANCH} from ${UPSTREAM_REMOTE}/${DEFAULT_BRANCH}"
git checkout ${DEFAULT_BRANCH}
Expand All @@ -77,16 +89,9 @@ fi
git cherry-pick 052b0b4ce989fe9aee01027e67e61538b48e1179 >/dev/null
}

if [[ -n ${patch_release} ]];then
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; }
else
prev_tag=${lasttag}
fi
COMMITS=$(git log --reverse --no-merges \
--pretty=format:'%H' HEAD \
--since "$(git log --pretty=format:%cd -1 ${prev_tag})")
COMMITS=$(git log --reverse --no-merges --pretty=format:'%H' ${prev_tag}..HEAD)

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

changelog=""
for c in ${COMMITS};do
Expand All @@ -96,6 +101,8 @@ for c in ${COMMITS};do
"
done

echo "${changelog}"

# Add our VERSION so Makefile will pick it up when compiling
echo ${RELEASE_VERSION#v} > VERSION
git add VERSION
Expand All @@ -107,6 +114,9 @@ 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"
git checkout ${DEFAULT_BRANCH}

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

for task in ${CATALOG_TASKS};do
Expand Down
Loading