Version bump: 4.0.3

Add --quiet flag to git diff

.github/workflows/build.yml

@@ -5,6 +5,7 @@ on:
       - dist
     paths:
       - src/**
+      - .github/workflows/build.yml
 
 jobs:
   build:
@@ -26,11 +27,10 @@ jobs:
         run: npm run build
 
       - name: Commit changes
-        uses: EndBug/add-and-commit@v2
+        uses: EndBug/add-and-commit@v4.0.0
         with:
-          force: true
           message: "[auto] Update compiled version"
-          path: lib
-          pattern: "*.js"
+          add: lib
+          force: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,9 +1,9 @@
 # Add & Commit
 
-You can use this GitHub Action to commit changes made in your workflow run directly to your repo: for example, you use it to lint your code, update documentation, commit updated builds and so on...
+You can use this GitHub Action to commit changes made in your workflow run directly to your repo: for example, you use it to lint your code, update documentation, commit updated builds, etc....
 
 This is **heavily** inspired by [git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) (by [Stefan Zweifel](https://github.com/stefanzweifel)): that action automatically detects changed files and commits them. While this is useful for most situations, this doesn't commit untracked files and can sometimes commit unintended changes (such as `package-lock.json` or similar, that may have happened during previous steps).  
-This action lets you choose the path that you want to use when adding & committing changes, so that it works as you would normally do using `git` on your machine.
+This action lets you choose the path that you want to use when adding & committing changes so that it works as you would normally do using `git` on your machine.
 
 ## Usage
 
@@ -12,7 +12,7 @@ Add a step like this to your workflow:
 ```yaml
 - uses: EndBug/add-and-commit@v4 # You can change this to use a specific version
   with:
-    # The arguments for the git add command (see the paragraph below for more info)
+    # The arguments for the `git add` command (see the paragraph below for more info)
     # Default: '.'
     add: 'src'
 
@@ -20,7 +20,7 @@ Add a step like this to your workflow:
     # Default: author of the commit that triggered the run
     author_name: Your Name
 
-    # The The email of the user that will be displayed as the author of the commit
+    # The email of the user that will be displayed as the author of the commit
     # Default: author of the commit that triggered the run
     author_email: mail@example.com
 
@@ -28,7 +28,7 @@ Add a step like this to your workflow:
     # Default: '.'
     cwd: './path/to/the/repo'
 
-    # Whether to use the --force option on git add, in order to bypass eventual gitignores
+    # Whether to use the --force option on `git add`, in order to bypass eventual gitignores
     # Default: false
     force: true
 
@@ -36,7 +36,7 @@ Add a step like this to your workflow:
     # Default: 'Commit from GitHub Actions'
     message: 'Your commit message'
 
-    #  The arguments for the git rm command (see the paragraph below for more info)
+    #  The arguments for the `git rm` command (see the paragraph below for more info)
     # Default: ''
     remove: "./dir/old_file.js"
 
@@ -48,17 +48,17 @@ Add a step like this to your workflow:
 ### Environment variables:
 
 The only `env` variable required is the token for the action to run: GitHub generates one automatically, but you need to pass it through `env` to make it available to actions. You can find more about `GITHUB_TOKEN` [here](https://help.github.com/en/articles/virtual-environments-for-github-actions#github_token-secret).  
-With that said, you can just copy the example line and don't worry about it. If you do want to use a different token you can pass that in, but I wouldn't see any possible advantage in doing so.
+That said, you can just copy the example line and not worry about it. If you do want to use a different token you can pass that in, but I wouldn't see any possible advantage in doing so.
 
 ### Adding files:
 
 The action adds files using a regular `git add` command, so you can put every kind of argument in the `add` option. For example, if you don't want it to use a recursive behavior: `$(find . -maxdepth 1 -name *.js)`.
-The script will not stop if one the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
+The script will not stop if one of the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
 
 ### Deleting files:
 
 You can delete files with the `remove` option: that runs a `git rm` command that will stage the files in the given path for removal. 
-The script will not stop if one the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
+The script will not stop if one of the git commands fails. E.g.: if your command shows a "fatal: pathspec 'yourFile' did not match any files" error the action will go on.
 
 ### Examples:
 
@@ -110,7 +110,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      # If you need to, you can checkout your repo to a different location
+      # If you need to, you can check out your repo to a different location
       - uses: actions/checkout@v2
         with:
           path: "./pathToRepo/"

action.yml

@@ -31,7 +31,7 @@ inputs:
 
 runs:
   using: node12
-  main: lib/main.js
+  main: lib/index.js
 
 branding:
   icon: git-commit

lib/entrypoint.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+set -u
+
+echo "::group::Internal logs"
+
+cd $INPUT_CWD
+echo "Running in $PWD."
+
+# 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 config --global user.email "$INPUT_AUTHOR_EMAIL"
+    git config --global user.name "$INPUT_AUTHOR_NAME"
+}
+
+add() {
+    if $INPUT_FORCE; then f=-f; else f=; fi
+    git add $INPUT_ADD $f
+}
+
+remove() {
+    if [ -n "$INPUT_REMOVE" ]; then git rm $INPUT_REMOVE; fi
+}
+
+# This is needed to make the check work for untracked files
+echo "Staging files..."
+add
+remove
+
+echo "Checking for uncommitted changes in the git working tree..."
+# This section only runs if there have been file changes
+if ! git diff --cached --quiet --exit-code; then
+    git_setup
+
+    git fetch
+
+    # Verify if the branch needs to be created
+    if ! git rev-parse --verify --quiet "${GITHUB_REF:11}"; then
+        echo "Creating branch..."
+        git branch "${GITHUB_REF:11}"
+    fi
+
+    # Switch to branch from current workflow run
+    echo "Switching branch..."
+    git checkout "${GITHUB_REF:11}"
+
+    echo "Pulling from remote..."
+    git fetch && git pull
+
+    echo "Resetting files..."
+    git reset
+
+    echo "Adding files..."
+    add
+
+    echo "Removing files..."
+    remove
+
+    echo "Creating commit..."
+    git commit -m "$INPUT_MESSAGE" --author="$INPUT_AUTHOR_NAME <$INPUT_AUTHOR_EMAIL>"
+
+    echo "Pushing to repo..."
+    git push --set-upstream origin "${GITHUB_REF:11}"
+
+    echo "::endgroup::"
+    echo "Task completed."
+else
+    echo "::endgroup::"
+    echo "Working tree clean. Nothing to commit."
+fi

lib/main.js

@@ -1 +0,0 @@
-"use strict";var __importStar=this&&this.__importStar||function(a){if(a&&a.__esModule)return a;var b={};if(null!=a)for(var c in a)Object.hasOwnProperty.call(a,c)&&(b[c]=a[c]);return b["default"]=a,b};Object.defineProperty(exports,"__esModule",{value:!0});const core=__importStar(require("@actions/core")),shell=__importStar(require("shelljs")),path=__importStar(require("path"));try{checkInputs(),shell.exec(path.join(__dirname,"../src/entrypoint.sh"))}catch(a){core.setFailed(a)}function checkInputs(){const a=process.env.GITHUB_EVENT_PATH;if(a){const{author:b}=require(a).head_commit;setDefault("author_name",b.name),setDefault("author_email",b.email)}else core.warning("No event path available, unable to fetch author info."),setDefault("author_name","Add & Commit Action"),setDefault("author_email","actions@github.com");core.info(`Using '${core.getInput("author_name")} <${core.getInput("author_email")}>' as author.`)}function setDefault(a,b){const c="INPUT_"+a.toUpperCase();process.env[c]||(process.env[c]=b)}

package.json

@@ -1,13 +1,11 @@
 {
   "name": "add-and-commit",
-  "version": "4.0.0",
+  "version": "4.0.3",
   "description": "Add & commit files from a path directly from GitHub Actions",
-  "main": "lib/main.js",
+  "main": "lib/index.js",
   "scripts": {
-    "build": "npm run compile && npm run minify && rm build/*.js",
-    "compile": "tsc",
-    "minify": "minify build -d lib",
-    "dist": "echo \"Preparing for distribution...\" && npm i --only=prod && git add -f node_modules && git commit -m \"Commit dist files\"",
+    "build": "npm i && ncc build src/main.ts --minify --out lib",
+    "watch": "ncc build src/main.ts --watch --out lib",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -28,15 +26,14 @@
   },
   "homepage": "https://github.com/EndBug/add-and-commit#readme",
   "dependencies": {
-    "@actions/core": "^1.1.3",
-    "shelljs": "^0.8.3"
+    "@actions/core": "^1.1.3"
   },
   "devDependencies": {
     "@types/node": "^12.7.12",
     "@types/shelljs": "^0.8.6",
     "@typescript-eslint/eslint-plugin": "^2.12.0",
     "@typescript-eslint/parser": "^2.12.0",
-    "babel-minify": "^0.5.1",
+    "@zeit/ncc": "^0.21.1",
     "eslint": "^6.8.0",
     "typescript": "^3.6.4"
   }

src/entrypoint.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -u
 
+echo "::group::Internal logs"
+
 cd $INPUT_CWD
 echo "Running in $PWD."
 
@@ -36,7 +38,7 @@ remove
 
 echo "Checking for uncommitted changes in the git working tree..."
 # This section only runs if there have been file changes
-if ! git diff --cached --exit-code; then
+if ! git diff --cached --quiet --exit-code; then
     git_setup
 
     git fetch
@@ -68,6 +70,10 @@ if ! git diff --cached --exit-code; then
 
     echo "Pushing to repo..."
     git push --set-upstream origin "${GITHUB_REF:11}"
+
+    echo "::endgroup::"
+    echo "Task completed."
 else
+    echo "::endgroup::"
     echo "Working tree clean. Nothing to commit."
 fi

src/main.ts

@@ -1,26 +1,31 @@
-import * as core from '@actions/core'
-import * as shell from 'shelljs'
-import * as path from 'path'
+import { info, setFailed, getInput, warning } from '@actions/core'
+import { join as path } from 'path'
+import { execFile } from 'child_process'
 
 try {
   checkInputs()
-  shell.exec(path.join(__dirname, '../src/entrypoint.sh'))
+  const child = execFile(path(__dirname, 'entrypoint.sh'))
+  child.stdout?.pipe(process.stdout)
+  child.stderr?.pipe(process.stderr)
 } catch (err) {
-  core.setFailed(err)
+  console.error(err)
+  setFailed(err instanceof Error ? err.message : err)
 }
 
 function checkInputs() {
   const eventPath = process.env.GITHUB_EVENT_PATH
-  if (eventPath) {
-    const { author } = require(eventPath).head_commit
+  const author = eventPath && require(eventPath)?.head_commit?.author
+
+  if (author) {
     setDefault('author_name', author.name)
     setDefault('author_email', author.email)
   } else {
-    core.warning('No event path available, unable to fetch author info.')
+    if (!getInput('author_name') || !getInput('author_email')) warning(`Unable to fetch author info: couldn't find ${!eventPath ? 'event path' : !require(eventPath)?.head_commit ? 'commit' : 'commit author'}.`)
     setDefault('author_name', 'Add & Commit Action')
     setDefault('author_email', 'actions@github.com')
   }
-  core.info(`Using '${core.getInput('author_name')} <${core.getInput('author_email')}>' as author.`)
+
+  info(`Using '${getInput('author_name')} <${getInput('author_email')}>' as author.`)
 }
 
 function setDefault(input: string, value: string) {