Skip to content
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.

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

Add v prefix to eksctl tags #3241

Merged
merged 1 commit into from
Feb 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,14 +270,14 @@ workflows:
branches:
ignore: /.*/
tags:
only: /[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+/
only: /v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+/
- release:
requires: [test-and-build]
filters:
branches:
ignore: /.*/
tags:
only: /[0-9]+\.[0-9]+\.[0-9]+/
only: /v[0-9]+\.[0-9]+\.[0-9]+/
scheduled-integration-tests:
triggers:
- schedule:
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/do-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ -z "${CIRCLE_PULL_REQUEST}" ] && [ -n "${CIRCLE_TAG}" ] && [ "${CIRCLE_PROJ
# the `head` statement in the brew tap formula
sleep 90 # GitHub API resolves the time to the nearest minute, so in order to control the sorting oder we need this

git tag --delete "${CIRCLE_TAG}"
git tag --delete "v${CIRCLE_TAG}"
git tag --force latest_release

if github-release info --user weaveworks --repo "${CIRCLE_PROJECT_REPONAME}" --tag latest_release > /dev/null 2>&1 ; then
Expand Down
2 changes: 1 addition & 1 deletion build/scripts/do-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [ -z "${CIRCLE_PULL_REQUEST}" ] && [ -n "${CIRCLE_TAG}" ] && [ "${CIRCLE_PROJ

sleep 90 # GitHub API resolves the time to the nearest minute, so in order to control the sorting oder we need this

git tag --delete "${CIRCLE_TAG}"
git tag --delete "v${CIRCLE_TAG}"
git tag --force latest_release

if github-release info --user weaveworks --repo "${CIRCLE_PROJECT_REPONAME}" --tag latest_release > /dev/null 2>&1 ; then
Expand Down
4 changes: 2 additions & 2 deletions build/scripts/tag-release-candidate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ m="Tag ${rc_version} release candidate"

commit "${m}" "${release_notes_file}"

tag_version_and_latest "${m}" "${rc_version}"
tag_version_and_latest "${m}" "v${rc_version}"

# Check if we need to bump version in the default branch
git checkout "${default_branch}"
prepare_for_next_version_if_at "${candidate_for_version}"

git push origin "${release_branch}:${release_branch}"
git push origin "${rc_version}"
git push origin "v${rc_version}"
git push origin "${default_branch}:${default_branch}" || gh pr create --fill --label "skip-release-notes"
4 changes: 2 additions & 2 deletions build/scripts/tag-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ m="Release ${release_version}"
commit "${m}" "${release_notes_file}"


tag_version_and_latest "${m}" "${release_version}"
tag_version_and_latest "${m}" "v${release_version}"

# Update the site by putting everything from the release into the docs branch
git push --force origin "${release_branch}":docs
Expand All @@ -37,5 +37,5 @@ git pull --ff-only origin "${default_branch}"
prepare_for_next_version_if_at "${release_version}"

git push origin "${release_branch}:${release_branch}"
git push origin "${release_version}"
git push origin "v${release_version}"
git push origin "${default_branch}:${default_branch}" || gh pr create --fill --label "skip-release-notes"