File tree 1 file changed +8
-25
lines changed
1 file changed +8
-25
lines changed Original file line number Diff line number Diff line change 4
4
5
5
echo
6
6
echo " 'Nightly Merge Action' is using the following input:"
7
- echo " - stable_branch = '$INPUT_STABLE_BRANCH '"
8
- echo " - development_branch = '$INPUT_DEVELOPMENT_BRANCH '"
7
+ echo " - source_branch = '$SOURCE_BRANCH '"
8
+ echo " - target_branch = '$TARGET_BRANCH '"
9
9
echo " - allow_ff = $INPUT_ALLOW_FF "
10
10
echo " - allow_git_lfs = $INPUT_GIT_LFS "
11
11
echo " - ff_only = $INPUT_FF_ONLY "
@@ -49,31 +49,14 @@ git config --global user.email "$INPUT_USER_EMAIL"
49
49
50
50
set -o xtrace
51
51
52
- git fetch origin $INPUT_STABLE_BRANCH
53
- git checkout -b $INPUT_STABLE_BRANCH origin/$INPUT_STABLE_BRANCH
52
+ git clone github.com/CumulusNetworks/docs
53
+ cd docs
54
+ git checkout $TARGET_BRANCH
54
55
55
- git fetch origin $INPUT_DEVELOPMENT_BRANCH
56
- git checkout -b $INPUT_DEVELOPMENT_BRANCH origin/$INPUT_DEVELOPMENT_BRANCH
57
-
58
- if git merge-base --is-ancestor $INPUT_STABLE_BRANCH $INPUT_DEVELOPMENT_BRANCH ; then
59
- echo " No merge is necessary"
60
- exit 0
61
- fi ;
62
-
63
- set +o xtrace
64
- echo
65
- echo " 'Nightly Merge Action' is trying to merge the '$INPUT_STABLE_BRANCH ' branch ($( git log -1 --pretty=%H $INPUT_STABLE_BRANCH ) )"
66
- echo " into the '$INPUT_DEVELOPMENT_BRANCH ' branch ($( git log -1 --pretty=%H $INPUT_DEVELOPMENT_BRANCH ) )"
67
- echo
68
- set -o xtrace
56
+ git fetch
69
57
70
58
# Do the merge
71
- git merge $FF_MODE --no-edit $INPUT_STABLE_BRANCH
72
-
73
- # Pull lfs if enabled
74
- if $INPUT_GIT_LFS ; then
75
- git lfs pull
76
- fi
59
+ git merge origin/$SOURCE_BRANCH
77
60
78
61
# Push the branch
79
- git push origin $INPUT_DEVELOPMENT_BRANCH
62
+ git push
You can’t perform that action at this time.
0 commit comments