suyiiyii/git-auto-commit-action
1
0
Fork 0
mirror of https://github.com/stefanzweifel/git-auto-commit-action.git synced 2024-12-06 02:09:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from stefanzweifel/revert-115-feature/checkout-options

Browse Source 
Revert "Feature: Checkout Options"
This commit is contained in:
Stefan Zweifel 2020-10-22 07:35:11 +02:00 committed by GitHub
commit 367938329d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/linter.yml vendored
View File

@ -14,6 +14,5 @@ jobs:
uses: github/super-linter@v3 uses: github/super-linter@v3
env: env:
VALIDATE_ALL_CODEBASE: false VALIDATE_ALL_CODEBASE: false
VALIDATE_MARKDOWN: false
DEFAULT_BRANCH: master DEFAULT_BRANCH: master
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

3
README.md
View File

@ -56,9 +56,6 @@ Add the following step at the end of your job, after other steps that might add
# Optional: Disable dirty check and always try to create a commit and push # Optional: Disable dirty check and always try to create a commit and push
skip_dirty_check: true skip_dirty_check: true
# Optional: Allows you to update how the repo is checked out
checkout_options: '-q --force -b'
``` ```
## Example ## Example

4
action.yml
View File

@ -44,10 +44,6 @@ inputs:
description: Push options (eg. --force) description: Push options (eg. --force)
required: false required: false
default: '' default: ''
checkout_options:
description: Checkout options (eg. --branch)
required: false
default: ''
skip_dirty_check: skip_dirty_check:
description: Skip the check if the git repository is dirty and always try to create a commit. description: Skip the check if the git repository is dirty and always try to create a commit.
required: false required: false

8
entrypoint.sh
View File

@ -29,11 +29,10 @@ _main() {
_switch_to_repository() { _switch_to_repository() {
echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY"; echo "INPUT_REPOSITORY value: $INPUT_REPOSITORY";
cd "$INPUT_REPOSITORY"; cd $INPUT_REPOSITORY;
} }
_git_is_dirty() { _git_is_dirty() {
# shellcheck disable=SC2086
[ -n "$(git status -s -- $INPUT_FILE_PATTERN)" ] [ -n "$(git status -s -- $INPUT_FILE_PATTERN)" ]
} }
@ -43,11 +42,8 @@ _switch_to_branch() {
# Fetch remote to make sure that repo can be switched to the right branch. # Fetch remote to make sure that repo can be switched to the right branch.
git fetch; git fetch;
# shellcheck disable=SC2206
INPUT_CHECKOUT_OPTIONS_ARRAY=( $INPUT_CHECKOUT_OPTIONS );
# Switch to branch from current Workflow run # Switch to branch from current Workflow run
git checkout ${INPUT_CHECKOUT_OPTIONS:+"${INPUT_CHECKOUT_OPTIONS_ARRAY[@]}"} "$INPUT_BRANCH" --; git checkout "$INPUT_BRANCH" --;
} }
_add_files() { _add_files() {

34
tests/git-auto-commit-mocked.bats
View File

@ -32,7 +32,6 @@ setup() {
export INPUT_COMMIT_AUTHOR="Test Suite <test@users.noreply.github.com>" export INPUT_COMMIT_AUTHOR="Test Suite <test@users.noreply.github.com>"
export INPUT_TAGGING_MESSAGE="" export INPUT_TAGGING_MESSAGE=""
export INPUT_PUSH_OPTIONS="" export INPUT_PUSH_OPTIONS=""
export INPUT_CHECKOUT_OPTIONS=""
export INPUT_SKIP_DIRTY_CHECK=false export INPUT_SKIP_DIRTY_CHECK=false
skipIfNot "$BATS_TEST_DESCRIPTION" skipIfNot "$BATS_TEST_DESCRIPTION"
@ -309,39 +308,6 @@ main() {
} }
@test "git-checkout-options-are-applied" {
INPUT_CHECKOUT_OPTIONS="-b --progress"
touch "${test_repository}"/new-file-{1,2,3}.txt
shellmock_expect git --type partial --output " M new-file-1.txt M new-file-2.txt M new-file-3.txt" --match "status"
shellmock_expect git --type exact --match "fetch"
shellmock_expect git --type exact --match "checkout -b --progress master --"
shellmock_expect git --type partial --match "add ."
shellmock_expect git --type partial --match '-c'
shellmock_expect git --type partial --match 'push --set-upstream origin'
run main
echo "$output"
# Success Exit Code
[ "$status" = 0 ]
[ "${lines[10]}" = "::debug::Push commit to remote branch master" ]
shellmock_verify
[ "${capture[0]}" = "git-stub status -s -- ." ]
[ "${capture[1]}" = "git-stub fetch" ]
[ "${capture[2]}" = "git-stub checkout -b --progress master --" ]
[ "${capture[3]}" = "git-stub add ." ]
[ "${capture[4]}" = "git-stub -c user.name=Test Suite -c user.email=test@github.com commit -m Commit Message --author=Test Suite <test@users.noreply.github.com>" ]
[ "${capture[5]}" = "git-stub push --set-upstream origin HEAD:master --tags" ]
}
@test "can-checkout-different-branch" { @test "can-checkout-different-branch" {
INPUT_BRANCH="foo" INPUT_BRANCH="foo"