Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for git lfs #2

Merged
merged 4 commits into from
Dec 13, 2019
Merged

Add support for git lfs #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a30674
Add support for git lfs
Dec 10, 2019
7879f7b
Add readme info for git lfs use
Dec 10, 2019
be24dce
Add comment in shell script
Dec 10, 2019
c7ef1d9
Fix readme
Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ The name of the development branch (default `devel`).
Allow fast forward merge (default `false`). If not enabled, merges will use
`--no-ff`.

### `allow_git_lfs`

Allow support for repositories that use `git lfs` (default `false`).

### `ff_only`

Refuse to merge and exit unless the current HEAD is already up to date or the
Expand Down
4 changes: 4 additions & 0 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ inputs:
description: 'Allow fast forward merge'
required: false
default: false
allow_git_lfs:
description: 'Allow git lfs support'
required: false
default: false
ff_only:
description: 'Refuse to perform a non fast forward merge (requires allow_ff=true)'
required: false
Expand Down
6 changes: 6 additions & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ echo " 'Nightly Merge Action' is using the following input:"
echo " - stable_branch = '$INPUT_STABLE_BRANCH'"
echo " - development_branch = '$INPUT_DEVELOPMENT_BRANCH'"
echo " - allow_ff = $INPUT_ALLOW_FF"
echo " - allow_git_lfs = $INPUT_GIT_LFS"
echo " - ff_only = $INPUT_FF_ONLY"
echo " - allow_forks = $INPUT_ALLOW_FORKS"
echo " - user_name = $INPUT_USER_NAME"
Expand Down Expand Up @@ -69,5 +70,10 @@ set -o xtrace
# Do the merge
git merge $FF_MODE --no-edit $INPUT_STABLE_BRANCH

# Pull lfs if enabled
if $INPUT_GIT_LFS; then
git lfs pull
fi

# Push the branch
git push origin $INPUT_DEVELOPMENT_BRANCH