Simplified scripts for copying to jb-main #1407
Conversation
scripts/snap/impl/snapToJbMain.sh
Outdated
| set -e | ||
|
|
||
| if [ -z "$1" ]; then | ||
| echo "Specify the snapping subfolder. For example: ./snapToJbMain.sh androidx/compose-ui/1.6.0-alpha02 compose ':(exclude)compose/material3'" |
There was a problem hiding this comment.
Description for args is not clear. What is branch? Out? In? Is it possible to specify hash? What is folder? What should be current git branch?
There was a problem hiding this comment.
This shouldn't be used explicitly. Added a comment to look the parent scripts/readme
scripts/snap/impl/snapToJbMain.sh
Outdated
|
|
||
|
|
||
| TO_JB_MAIN_BRANCH=integration-snap/$CURRENT_COMMIT/to-jb-main | ||
| git checkout --quiet $(git merge-base $CURRENT_COMMIT origin/jb-main) -B $TO_JB_MAIN_BRANCH |
There was a problem hiding this comment.
Doesn't work for my case: remote can have not "origin" name
There was a problem hiding this comment.
removed. local branches should be up-to-date to this point anyway.
There was a problem hiding this comment.
local branches should be up-to-date to this point anyway.
Actually, I am wrong, all work can be done in "integration" without updating "jb-main".
Fixed reading the associated remote.
Co-authored-by: Ivan Matkov <ivan.matkov@jetbrains.com>
Co-authored-by: Ivan Matkov <ivan.matkov@jetbrains.com>
Co-authored-by: Ivan Matkov <ivan.matkov@jetbrains.com>
Co-authored-by: Ivan Matkov <ivan.matkov@jetbrains.com>
Co-authored-by: Ivan Matkov <ivan.matkov@jetbrains.com>
|
Let's not merge it, as we are discussing to not use "snaps" anymore. |
igordmn
changed the title
igordmn
changed the title
|
These scripts still simplify process. I changed them for "copying" approach |
Now we need only to switch to the commit, and call a needed script. It creates 2 branches, which can be tested on CI, and merged with simple git merge.
Branches:
