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

Branch awareness #35

Merged
merged 3 commits into from
Oct 19, 2020
Merged

Conversation

jharveysmith
Copy link
Member

This creates separate branches for each release series (2.1, 2.2, etc).
Not sure how this will play with the helm repo site. I'll have an alternative approaching using release directories in master branch shortly.

Copy link
Member

@svarnau svarnau left a comment

Choose a reason for hiding this comment

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

Looks good, but maybe we need to change yugabyte-db side first, to send new parameter.

@@ -47,7 +71,7 @@ jobs:
git add ./stable/yugabyte/Chart.yaml ./stable/yugaware/Chart.yaml \
./stable/yugabyte/values.yaml ./stable/yugaware/values.yaml ./stable/yugabyte/app-readme.md
git commit -m "Update the version to ${{steps.extract-version.outputs.yb_version}}"
git push origin ${{ github.ref }}
git push
Copy link
Member

Choose a reason for hiding this comment

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

To be specific, maybe: git push origin HEAD

@@ -3,12 +3,15 @@ on:
repository_dispatch:
types:
- update-on-release
env:
CURRENT_STABLE: 2.3
Copy link
Member

Choose a reason for hiding this comment

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

As discussed, I think I prefer if the dispatcher side send parameter is_master, based on content of version.txt on master branch on that side.

run: |
rel=${{steps.extract-version.outputs.yb_version}}
a=( ${rel//./ } )
branch_name="${a[0]}.${a[1]}"
Copy link
Member

Choose a reason for hiding this comment

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

Come to think of it, maybe we should do this calculation on dispatcher side and send a branch_name parameter? Then we won't need the is_master parameter, we just get teh branch name from yugabyte-db side.

Copy link
Member Author

Choose a reason for hiding this comment

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

If we do this, lets call it yb_release or maybe yb_release_train or release_train rather than branch.

@jharveysmith jharveysmith merged commit c84ee6c into yugabyte:master Oct 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants