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

Handle CLI tagging when latest tag is of n-1 branch #8530

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

rahulbabu95
Copy link
Member

Description of changes:
When a 'n-1' version of eks-a is released, the script responsible for tagging the dev CLI pulls in the latest tag, bumps it by 1 to arrive at the next Dev tag for the CLI. This had worked fine until we supported for release branch n. With n-1 support, we need to factor in if the latest release is of 'n-1' and ignore it during the dev tagging.

Testing:
Ran the make eks-a command before and after this change to see the Dev CLI tag.

Before:
/Library/Developer/CommandLineTools/usr/bin/make eks-a-binary GIT_VERSION=v0.20.0-dev+latest
After:
/Library/Developer/CommandLineTools/usr/bin/make eks-a-binary GIT_VERSION=v0.21.0-dev+latest

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from rahulbabu95. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@eks-distro-bot eks-distro-bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 23, 2024
Signed-off-by: Rahul Ganesh <rahulgab@amazon.com>
Copy link

codecov bot commented Jul 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.50%. Comparing base (2e15d06) to head (651e298).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #8530   +/-   ##
=======================================
  Coverage   73.50%   73.50%           
=======================================
  Files         578      578           
  Lines       36531    36531           
=======================================
  Hits        26853    26853           
  Misses       7956     7956           
  Partials     1722     1722           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rahulbabu95
Copy link
Member Author

/hold


# Query to check if the latest_tag is of n'th branch.
# For ex, if the latest release is of n-1 branch, we need to ignore that tag and find the next branch.
latest_minor=$(echo "${latest_tag}" | cut -d "." -f 2)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
latest_minor=$(echo "${latest_tag}" | cut -d "." -f 2)
latest_minor=$(( $(echo "${latest_tag}" | cut -d "." -f 2) + 1 ))

nit: could combine it into one line and accurately name the var

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/hold size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants