Skip to content

Commit 9503476

Browse files
committed
[CLK REBASE] Add intendend execution plan print
If for whatever reason the execution fails its annoying to figure out what the remaining commands need to be this prefills them out so if it fails its easy to pick up upon failure. Future work: Self Healing
1 parent 16c2019 commit 9503476

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

lt_rebase_merge.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,23 @@ if ! [[ $NEW_GKH_TAG =~ $NVR_REGEX ]]; then # check if NEW_GKH_TAG matches the r
6060
exit 1
6161
fi
6262
NEW_CIQ_TAG="ciq_kernel-${NEW_GKH_TAG}-1"
63-
64-
6563
# merge PR branch into next branch
6664
set +x
65+
66+
echo "Commands expected to run (This is in the even it fails during the run)"
67+
echo "git checkout $NEXT_BRANCH"
68+
echo "git pull origin $NEXT_BRANCH"
69+
echo "git merge --ff-only $PR_BRANCH"
70+
echo "git push origin $NEXT_BRANCH"
71+
echo "git branch -m $TARGET_BRANCH $PAST_VERSION_BRANCH"
72+
echo "git push origin :$TARGET_BRANCH $PAST_VERSION_BRANCH"
73+
echo "git push origin -u $PAST_VERSION_BRANCH"
74+
echo "git branch -m $NEXT_BRANCH $TARGET_BRANCH"
75+
echo "git push origin :$NEXT_BRANCH $TARGET_BRANCH"
76+
echo "git push origin -u $TARGET_BRANCH"
77+
echo "git tag $NEW_CIQ_TAG $TARGET_BRANCH"
78+
echo "git push origin $NEW_CIQ_TAG"
79+
6780
echo "git checkout $NEXT_BRANCH"
6881
git checkout $NEXT_BRANCH
6982
if [ $? -ne 0 ]; then

0 commit comments

Comments
 (0)