Skip to content

Commit da2d82b

Browse files
authored
Update entrypoint.sh
1 parent d009c78 commit da2d82b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

entrypoint.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44

55
echo
66
echo " 'Nightly Merge Action' is using the following input:"
7-
echo " - source_branch = '$SOURCE_BRANCH'"
8-
echo " - target_branch = '$TARGET_BRANCH'"
7+
echo " - source_branch = '$INPUT_SOURCE_BRANCH'"
8+
echo " - target_branch = '$INPUT_TARGET_BRANCH'"
99
echo " - allow_ff = $INPUT_ALLOW_FF"
1010
echo " - allow_git_lfs = $INPUT_GIT_LFS"
1111
echo " - ff_only = $INPUT_FF_ONLY"
@@ -49,12 +49,12 @@ git config --global user.email "$INPUT_USER_EMAIL"
4949

5050
set -o xtrace
5151

52-
git checkout $TARGET_BRANCH
52+
git checkout $INPUT_TARGET_BRANCH
5353

5454
git fetch
5555

5656
# Do the merge
57-
git merge origin/$SOURCE_BRANCH
57+
git merge origin/$INPUT_SOURCE_BRANCH
5858

5959
# Push the branch
6060
git push

0 commit comments

Comments
 (0)