From 4b2201fcd1984de36ce06e31b5eafaaa63eacec0 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 31 Aug 2019 18:02:55 +0200 Subject: [PATCH 1/6] Update Entrypoint --- entrypoint.sh | 54 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 419e8a6..33468e7 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -2,15 +2,53 @@ set -eu # Switch to branch from current Workflow run -git checkout "${GITHUB_REF:11}" +# git checkout "${GITHUB_REF:11}" # Set origin URL -git remote set-url origin https://$TOKEN:x-oauth-basic@github.com/$GITHUB_REPOSITORY +# git remote set-url origin https://$TOKEN:x-oauth-basic@github.com/$GITHUB_REPOSITORY -git config --global user.email "actions@github.com" -git config --global user.name "GitHub Actions" +# git config --global user.email "actions@github.com" +# git config --global user.name "GitHub Actions" -git add -A -git status -git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." -git push -u origin HEAD +# git add -A +# git status +# git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." +# git push -u origin HEAD + + + +# Set up .netrc file with GitHub credentials +git_setup ( ) { + cat <<- EOF > $HOME/.netrc + machine github.com + login $GITHUB_ACTOR + password $GITHUB_TOKEN + + machine api.github.com + login $GITHUB_ACTOR + password $GITHUB_TOKEN +EOF + chmod 600 $HOME/.netrc + + # Git requires our "name" and email address -- use GitHub handle + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + git config user.name "$GITHUB_ACTOR" + + # Push to the current branch if PUSH_BRANCH hasn't been overriden + : ${PUSH_BRANCH:=`echo "$GITHUB_REF" | awk -F / '{ print $3 }' `} +} + + +# This section only runs if there have been file changes +echo "Checking for uncommitted changes in the git working tree." +if ! git diff --quiet +then + git_setup + + git checkout $PUSH_BRANCH + git add . + git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." + git push --set-upstream origin $PUSH_BRANCH +else + echo "Working tree clean. Nothing to commit." +fi From fbe300afdfecf4495bf1e80911192bec96f73c08 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 31 Aug 2019 18:07:25 +0200 Subject: [PATCH 2/6] Tinker tinker --- entrypoint.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 33468e7..1b27752 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -35,7 +35,7 @@ EOF git config user.name "$GITHUB_ACTOR" # Push to the current branch if PUSH_BRANCH hasn't been overriden - : ${PUSH_BRANCH:=`echo "$GITHUB_REF" | awk -F / '{ print $3 }' `} + # : ${PUSH_BRANCH:=`echo "$GITHUB_REF" | awk -F / '{ print $3 }' `} } @@ -45,10 +45,12 @@ if ! git diff --quiet then git_setup - git checkout $PUSH_BRANCH + git checkout "${GITHUB_REF:11}" + # git checkout $PUSH_BRANCH git add . git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." - git push --set-upstream origin $PUSH_BRANCH + git push --set-upstream origin "${GITHUB_REF:11}" + # git push --set-upstream origin $PUSH_BRANCH else echo "Working tree clean. Nothing to commit." fi From ef070dad0586d01cbcbdcc70b70d94e376bd421a Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 31 Aug 2019 18:10:59 +0200 Subject: [PATCH 3/6] Updates --- entrypoint.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 1b27752..68ecc49 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -49,7 +49,8 @@ then # git checkout $PUSH_BRANCH git add . git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." - git push --set-upstream origin "${GITHUB_REF:11}" + git push -u origin HEAD + # git push --set-upstream origin "${GITHUB_REF:11}" # git push --set-upstream origin $PUSH_BRANCH else echo "Working tree clean. Nothing to commit." From 49fa6b4e7a8d92bae68874442ecbc3f78f7a97c7 Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 31 Aug 2019 18:14:28 +0200 Subject: [PATCH 4/6] WIP --- entrypoint.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 68ecc49..1b27752 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -49,8 +49,7 @@ then # git checkout $PUSH_BRANCH git add . git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." - git push -u origin HEAD - # git push --set-upstream origin "${GITHUB_REF:11}" + git push --set-upstream origin "${GITHUB_REF:11}" # git push --set-upstream origin $PUSH_BRANCH else echo "Working tree clean. Nothing to commit." From 8d47eb33c597ad26c347ecdc55c756742ca8732c Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 31 Aug 2019 18:15:13 +0200 Subject: [PATCH 5/6] Use Actions as Git User --- entrypoint.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 1b27752..fd3aeb5 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -7,8 +7,8 @@ set -eu # Set origin URL # git remote set-url origin https://$TOKEN:x-oauth-basic@github.com/$GITHUB_REPOSITORY -# git config --global user.email "actions@github.com" -# git config --global user.name "GitHub Actions" +git config --global user.email "actions@github.com" +git config --global user.name "GitHub Actions" # git add -A # git status @@ -31,8 +31,8 @@ EOF chmod 600 $HOME/.netrc # Git requires our "name" and email address -- use GitHub handle - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - git config user.name "$GITHUB_ACTOR" + # git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + # git config user.name "$GITHUB_ACTOR" # Push to the current branch if PUSH_BRANCH hasn't been overriden # : ${PUSH_BRANCH:=`echo "$GITHUB_REF" | awk -F / '{ print $3 }' `} From 0364ecfe57919e82e6e57cb9d28297caa71e5fbb Mon Sep 17 00:00:00 2001 From: Stefan Zweifel Date: Sat, 31 Aug 2019 18:34:01 +0200 Subject: [PATCH 6/6] Update Entrypoint --- entrypoint.sh | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index fd3aeb5..58fe291 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,22 +1,6 @@ #!/bin/sh set -eu -# Switch to branch from current Workflow run -# git checkout "${GITHUB_REF:11}" - -# Set origin URL -# git remote set-url origin https://$TOKEN:x-oauth-basic@github.com/$GITHUB_REPOSITORY - -git config --global user.email "actions@github.com" -git config --global user.name "GitHub Actions" - -# git add -A -# git status -# git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." -# git push -u origin HEAD - - - # Set up .netrc file with GitHub credentials git_setup ( ) { cat <<- EOF > $HOME/.netrc @@ -28,14 +12,10 @@ git_setup ( ) { login $GITHUB_ACTOR password $GITHUB_TOKEN EOF - chmod 600 $HOME/.netrc + chmod 600 $HOME/.netrc - # Git requires our "name" and email address -- use GitHub handle - # git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - # git config user.name "$GITHUB_ACTOR" - - # Push to the current branch if PUSH_BRANCH hasn't been overriden - # : ${PUSH_BRANCH:=`echo "$GITHUB_REF" | awk -F / '{ print $3 }' `} + git config --global user.email "actions@github.com" + git config --global user.name "GitHub Actions" } @@ -45,12 +25,14 @@ if ! git diff --quiet then git_setup + # Switch to branch from current Workflow run git checkout "${GITHUB_REF:11}" - # git checkout $PUSH_BRANCH + git add . - git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" || echo "No changes found. Nothing to commit." + + git commit -m "$INPUT_COMMIT_MESSAGE" --author="$INPUT_COMMIT_AUTHOR_NAME <$INPUT_COMMIT_AUTHOR_EMAIL>" + git push --set-upstream origin "${GITHUB_REF:11}" - # git push --set-upstream origin $PUSH_BRANCH else echo "Working tree clean. Nothing to commit." fi