Add rebase script #1936
Add rebase script #1936
Conversation
Bring in the changes in rancher#1567 that came from Jack testing the scripts out.
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.
aiyengar2
force-pushed
the
add_rebase_script
branch
from
e9aeb09
to
e7b0529
Compare
|
|
||
| # Process each commit | ||
| if [ -z "${SUB_DIRECTORY}" ]; then | ||
| COMMITS=$(git log --first-parent --oneline ${CURRENT_COMMIT}..${NEW_COMMIT} | cut -d' ' -f1 | tail -r) |
There was a problem hiding this comment.
suggest replacing ll occurances of tail -r with tac as linux GNU tail `does not support that option via the GNU docs
GNU tail can output any amount of data (some other versions of tail cannot). It also has no -r option (print in reverse), since reversing a file is really a different job from printing the end of a file; BSD tail (which is the one with -r) can only reverse files that are at most as large as its buffer, which is typically 32 KiB. A more reliable and versatile way to reverse files is the GNU tac command.
|
Hello @aiyengar2 can I close this PR? |
|
If we close this issue, I would like to have the rebase script stored somewhere outside of just the prometheus-federator. The rebase script is very helpful, especially when you have to do multiple charts / subcharts so I would like to get this into rancher/charts if possible |
|
@joshmeranda You can store the script in your forked repository. In order to improve the traceability and the automation, we plan to set one PR → one chart (modify). |
This seems promising @recena I will keep this one open. |
|
Ended up writing a replacement tool for this script to get around some of the pain points with the script. If @rancher/mapps is interested, it would be trivial to integrate it into |
This script powered #1072, which rebased 5 charts.
Related Issue: rancher/charts-build-scripts#31
Followup to #1079.