Skip to content

Commit

Permalink
Revert "Add v prefix to eksctl tags (#3241)"
Browse files Browse the repository at this point in the history
This reverts commit 3940689.
  • Loading branch information
michaelbeaumont committed Feb 12, 2021
1 parent b0a8a41 commit 4882c25
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,14 @@ workflows:
branches:
ignore: /.*/
tags:
only: /v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+/
only: /[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+/
- release:
requires: [test-and-build]
filters:
branches:
ignore: /.*/
tags:
only: /v[0-9]+\.[0-9]+\.[0-9]+/
only: /[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 "v${CIRCLE_TAG}"
git tag --delete "${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 "v${CIRCLE_TAG}"
git tag --delete "${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}" "v${rc_version}"
tag_version_and_latest "${m}" "${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 "v${rc_version}"
git push origin "${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}" "v${release_version}"
tag_version_and_latest "${m}" "${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 "v${release_version}"
git push origin "${release_version}"
git push origin "${default_branch}:${default_branch}" || gh pr create --fill --label "skip-release-notes"

0 comments on commit 4882c25

Please sign in to comment.