Add rebase script #1079
Add rebase script #1079
Conversation
|
Waiting to review until 2.5.8 calms down |
There was a problem hiding this comment.
This PR needs to be moved to the dev-v2.5 branch as the dev-v2.5-source branch is now deprecated.
The easiest way to do this would be to create a new local branch from the dev-v2.5 branch, cherry-pick your commits from the branch this PR points to to that new branch, and then run make charts to generate the charts/ and assets/ as part of the new provisioning workflow.
More details on the new workflow can be found in https://github.com/rancher/charts/blob/dev-v2.5/packages/README.md#common-workflow. Feel free to find me on Slack / RocketChat or email me at arvind.iyengar@suse.com for any questions.
|
Isn't this one closed now ? I thought we removed |
aiyengar2
force-pushed
the
add_rebase_script_to_charts
branch
from
7442ed9
to
68e47fa
Compare
|
Updated base to dev-v2.5 |
|
Is this still a thing ? 😆 |
Yup, still should be valid. Going to be using it soon for rebasing Monitoring |
|
Pushed some modifications to this script due to needing to have support for rebasing charts that have an excludes directory. |
aiyengar2
force-pushed
the
add_rebase_script_to_charts
branch
from
412a1bb
to
8fad16a
Compare
Bring in the changes in rancher#1567 that came from Jack testing the scripts out.
aiyengar2
force-pushed
the
add_rebase_script_to_charts
branch
from
a83584c
to
5024871
Compare
| else | ||
| echo "1) Add all changes to ${DEST_DIRECTORY} to staging (e.g. git add)" | ||
| fi | ||
| echo "2) Commit all other changes to save them (e.g. 'git add <changes>; git commit -m \"message\"')" |
There was a problem hiding this comment.
When I used this script, I did not do git commit to commit changes; instead, I just did the git add then exited the shell. So the git commit looks like an optional step here.
There was a problem hiding this comment.
Ah yes, this seems to be improperly worded. The idea is that the script supports if you make additional changes during commits, as long as those changes were not made to packages/{PACKAGE}/charts, packages/{PACKAGE}/charts-crd, packages/{PACKAGE}/generated-changes/excludes. But that doesn't seem to be clearly communicated at all here 😅
In newer versions of Git, these arguments cannot be provided due to git/git@9a3e3ca. Relevant comment: > It could be argued that this change might break existing users. I'd argue that those existing users are already broken, and they just don't know it. Let them know that they're broken.
|
Closing in favor of rebased PR in #1936 |
This script powered #1072, which rebased 5 charts.
Related Issue: rancher/charts-build-scripts#31