docs: update changelog

* docs: update README.md [skip ci]

* docs: update .all-contributorsrc [skip ci]

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>

.all-contributorsrc

@@ -342,6 +342,69 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "Namyalg",
+      "name": "Namya LG",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53875297?v=4",
+      "profile": "https://linkedin.com/in/namyalg",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sconix",
+      "name": "Janne Julkunen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/921515?v=4",
+      "profile": "https://github.com/sconix",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "Josh-Cena",
+      "name": "Joshua Chen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55398995?v=4",
+      "profile": "https://joshcena.com",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "Akimon658",
+      "name": "Akimo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81888693?v=4",
+      "profile": "http://akimon658.github.io",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "revolunet",
+      "name": "Julien Bouquillon",
+      "avatar_url": "https://avatars.githubusercontent.com/u/124937?v=4",
+      "profile": "https://revolunet.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AvivPeledTalon",
+      "name": "Aviv Peled",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92471076?v=4",
+      "profile": "https://github.com/AvivPeledTalon",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "onedr0p",
+      "name": "Devin Buhl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/213795?v=4",
+      "profile": "https://github.com/onedr0p",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [9.0.1] - 2022-06-26
+### Fixed:
+- Now files are re-staged after pulling, so that the action works as intended when using options such as `pull: --rebase --autostash`
+
+## [9.0.0] - 2022-03-11
+
+### Changed:
+
+- **[BREAKING]** The action will now fail when the `git commit` command fails. (#370)
+- **[BREAKING]** The action won't try deleting and re-creting tags when it fails to push them, it's now up to you to set the proper arguments (see the `tag_push` input). (#367)
+
+### Added:
+
+- `tag_push` input: you can now set the arguments of the `git push --tags` command.
+- `tag_pushed` output: whether the action pushed tags.
+
+## [8.0.2] - 2022-02-07
+
+### Fixed:
+
+- The `commit` input is now properly listed in the README. (#360)
+
 ## [8.0.1] - 2022-01-23
 
 ### Fixed:
@@ -299,7 +321,7 @@ First release
 
 #
 
-[unreleased]: https://github.com/EndBug/add-and-commit/compare/v8.0.1...HEAD
+[unreleased]: https://github.com/EndBug/add-and-commit/compare/v9.0.1...HEAD
 [1.0.0]: https://github.com/EndBug/add-and-commit/tree/v1.0.0
 [2.0.0]: https://github.com/EndBug/add-and-commit/compare/v1.0.0...v2.0.0
 [2.1.0]: https://github.com/EndBug/add-and-commit/compare/v2.0.0...v2.1.0
@@ -339,3 +361,6 @@ First release
 [7.5.0]: https://github.com/EndBug/add-and-commit/compare/v7.4.0...v7.5.0
 [8.0.0]: https://github.com/EndBug/add-and-commit/compare/v7.5.0...v8.0.0
 [8.0.1]: https://github.com/EndBug/add-and-commit/compare/v8.0.0...v8.0.1
+[8.0.2]: https://github.com/EndBug/add-and-commit/compare/v8.0.1...v8.0.2
+[9.0.0]: https://github.com/EndBug/add-and-commit/compare/v8.0.2...v9.0.0
+[9.0.1]: https://github.com/EndBug/add-and-commit/compare/v9.0.0...v9.0.1

README.md

@@ -1,6 +1,5 @@
 # Add & Commit
 
-[![Public workflows that use this action.](https://img.shields.io/endpoint?url=https%3A%2F%2Fapi-endbug.vercel.app%2Fapi%2Fgithub-actions%2Fused-by%3Faction%3DEndBug%2Fadd-and-commit%26badge%3Dtrue)](https://github.com/search?o=desc&q=EndBug+add-and-commit+path%3A.github%2Fworkflows+language%3AYAML&s=&type=Code)
 [![All Contributors](https://img.shields.io/github/all-contributors/EndBug/add-and-commit)](#contributors-)
 
 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...
@@ -18,7 +17,7 @@ You can use this GitHub Action to commit changes made in your workflow run direc
 Add a step like this to your workflow:
 
 ```yaml
-- uses: EndBug/add-and-commit@v8 # You can change this to use a specific version.
+- uses: EndBug/add-and-commit@v9 # You can change this to use a specific version.
   with:
     # The arguments for the `git add` command (see the paragraph below for more info)
     # Default: '.'
@@ -32,6 +31,10 @@ Add a step like this to your workflow:
     # Default: depends on the default_author input
     author_email: mail@example.com
 
+    # Additional arguments for the git commit command. The --message argument is already set by the message input.
+    # Default: ''
+    commit: --signoff
+
     # The name of the custom committer you want to use, if different from the author of the commit.
     # Default: the name of the author (set with either author_name or default_author)
     committer_name: Committer Name
@@ -81,6 +84,10 @@ Add a step like this to your workflow:
     # Arguments for the git tag command (the tag name always needs to be the first word not preceded by an hyphen)
     # Default: ''
     tag: 'v1.0.0 --force'
+
+    # Arguments for the git push --tags command (any additional argument will be added after --tags)
+    # Default: ''
+    tag_push: '--force'
 ```
 
 ### Git arguments
@@ -127,7 +134,9 @@ If you want to commit files "across different branches", here are two ways to do
 
 ### Tagging
 
-You can use the `tag` option to enter the arguments for a `git add` command. In order for the action to isolate the tag name from the rest of the arguments, it should be the first word not preceded by an hyphen (e.g. `-a tag-name -m "some other stuff"` is ok).
+You can use the `tag` option to enter the arguments for a `git add` command. In order for the action to isolate the tag name from the rest of the arguments, it should be the first word not preceded by an hyphen (e.g. `-a tag-name -m "some other stuff"` is ok).  
+You can also change the arguments of the push command for tags: every argument in the `tag_push` input will be appended to the `git push --tags` command.  
+For more info on how git arguments are parsed, see [the "Git arguments" section](#git-arguments).
 
 ## Outputs
 
@@ -138,6 +147,7 @@ The action provides these outputs:
 - `commit_sha`: the short 7-character SHA of the commit that has just been created
 - `pushed`: whether the action has pushed to the remote (`'true'` or `'false'`)
 - `tagged`: whether the action has created a tag (`'true'` or `'false'`)
+- `tag_pushed`: whether the action has pushed a tag (`'true'` or `'false'`)
 
 For more info on how to use outputs, see ["Context and expression syntax"](https://docs.github.com/en/free-pro-team@latest/actions/reference/context-and-expression-syntax-for-github-actions).
 
@@ -151,9 +161,9 @@ You can set it up like this:
 
 ```yaml
 - uses: actions/checkout@v2
-    with:
-      repository: ${{ github.event.pull_request.head.repo.full_name }}
-      ref: ${{ github.event.pull_request.head.ref }}
+  with:
+    repository: ${{ github.event.pull_request.head.repo.full_name }}
+    ref: ${{ github.event.pull_request.head.ref }}
 ```
 
 You can find the full docs for payloads of `pull_request` events [here](https://docs.github.com/en/developers/webhooks-and-events/webhooks/webhook-events-and-payloads#webhook-payload-example-32).
@@ -204,7 +214,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: EndBug/add-and-commit@v8
+      - uses: EndBug/add-and-commit@v9
         with:
           default_author: github_actions
 ```
@@ -214,7 +224,7 @@ You can also use the `committer_name` and `committer_email` inputs to make it ap
 <img src="https://user-images.githubusercontent.com/26386270/130594168-1d910710-e2d0-4b06-9324-cbe5dde59154.png" height=70/>
 
 ```yaml
-- uses: EndBug/add-and-commit@v8
+- uses: EndBug/add-and-commit@v9
   with:
     message: Show GitHub Actions logo
     committer_name: GitHub Actions
@@ -224,7 +234,7 @@ You can also use the `committer_name` and `committer_email` inputs to make it ap
 <img src="https://user-images.githubusercontent.com/26386270/130594443-b881fae7-3064-4020-a4cc-6db37ef0df65.png" height=70/>
 
 ```yaml
-- uses: EndBug/add-and-commit@v8
+- uses: EndBug/add-and-commit@v9
   with:
     message: Show GitHub logo
     committer_name: GitHub Actions
@@ -259,7 +269,7 @@ jobs:
         run: eslint "src/**" --fix
 
       - name: Commit changes
-        uses: EndBug/add-and-commit@v8
+        uses: EndBug/add-and-commit@v9
         with:
           author_name: Your Name
           author_email: mail@example.com
@@ -290,7 +300,7 @@ jobs:
       - run: echo "123" > ./pathToRepo/file.txt
 
       # ...and then use the action as you would normally do, but providing the path to the repo
-      - uses: EndBug/add-and-commit@v8
+      - uses: EndBug/add-and-commit@v9
         with:
           message: 'Add the very useful text file'
           add: '*.txt --force'
@@ -352,6 +362,15 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/prince-chrismc"><img src="https://avatars.githubusercontent.com/u/16867443?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Chris Mc</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=prince-chrismc" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://linkedin.com/in/namyalg"><img src="https://avatars.githubusercontent.com/u/53875297?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Namya LG</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=Namyalg" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/sconix"><img src="https://avatars.githubusercontent.com/u/921515?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Janne Julkunen</b></sub></a><br /><a href="#ideas-sconix" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://joshcena.com"><img src="https://avatars.githubusercontent.com/u/55398995?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Joshua Chen</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3AJosh-Cena" title="Bug reports">🐛</a></td>
+    <td align="center"><a href="http://akimon658.github.io"><img src="https://avatars.githubusercontent.com/u/81888693?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Akimo</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=Akimon658" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://revolunet.com"><img src="https://avatars.githubusercontent.com/u/124937?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Julien Bouquillon</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/commits?author=revolunet" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/AvivPeledTalon"><img src="https://avatars.githubusercontent.com/u/92471076?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Aviv Peled</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3AAvivPeledTalon" title="Bug reports">🐛</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/onedr0p"><img src="https://avatars.githubusercontent.com/u/213795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Devin Buhl</b></sub></a><br /><a href="https://github.com/EndBug/add-and-commit/issues?q=author%3Aonedr0p" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

action.yml

@@ -52,6 +52,9 @@ inputs:
   tag:
     description: Arguments for the git tag command (the tag name always needs to be the first word not preceded by a hyphen)
     required: false
+  tag_push:
+    description: Arguments for the git push --tags command (any additional argument will be added after --tags)
+    required: false
     
   # Input not required from the user
   github_token:
@@ -70,6 +73,8 @@ outputs:
     description: Whether the action has pushed to the remote.
   tagged:
     description: Whether the action has created a tag.
+  tag_pushed:
+    description: Whether the action has pushed a tag.
 
 runs:
   using: node12

package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-and-commit",
-  "version": "8.0.1",
+  "version": "9.0.1",
   "private": true,
   "description": "Add & commit files from a path directly from GitHub Actions",
   "main": "lib/index.js",
@@ -31,10 +31,10 @@
   },
   "homepage": "https://github.com/EndBug/add-and-commit#readme",
   "dependencies": {
-    "@actions/core": "^1.6.0",
+    "@actions/core": "^1.9.0",
     "actions-toolkit": "github:EndBug/actions-toolkit#core-actions",
     "js-yaml": "^4.1.0",
-    "simple-git": "^2.27.0",
+    "simple-git": "^3.7.1",
     "string-argv": "^0.3.1"
   },
   "devDependencies": {
@@ -42,15 +42,15 @@
     "@types/node": "^12.12.54",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
-    "@vercel/ncc": "^0.33.1",
+    "@vercel/ncc": "^0.34.0",
     "all-contributors-cli": "^6.20.0",
     "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "husky": "^7.0.4",
-    "prettier": "^2.5.1",
-    "ts-node": "^10.4.0",
-    "typescript": "^4.5.4",
+    "husky": "^8.0.1",
+    "prettier": "^2.7.1",
+    "ts-node": "^10.8.1",
+    "typescript": "^4.7.4",
     "yamljs": "^0.3.0"
   }
 }

src/io.ts

@@ -17,6 +17,7 @@ interface InputTypes {
   push: string
   remove: string | undefined
   tag: string | undefined
+  tag_push: string | undefined
 
   github_token: string | undefined
 }
@@ -28,6 +29,7 @@ interface OutputTypes {
   commit_sha: string | undefined
   pushed: 'true' | 'false'
   tagged: 'true' | 'false'
+  tag_pushed: 'true' | 'false'
 }
 export type output = keyof OutputTypes
 
@@ -36,7 +38,8 @@ export const outputs: OutputTypes = {
   commit_long_sha: undefined,
   commit_sha: undefined,
   pushed: 'false',
-  tagged: 'false'
+  tagged: 'false',
+  tag_pushed: 'false'
 }
 // Setup default output values
 Object.entries(outputs).forEach(([name, value]) => core.setOutput(name, value))

src/main.ts

@@ -16,16 +16,17 @@ core.info(`Running in ${baseDir}`)
   core.startGroup('Internal logs')
   core.info('> Staging files...')
 
-  const peh = getInput('pathspec_error_handling')
+  const ignoreErrors =
+    getInput('pathspec_error_handling') == 'ignore' ? 'pathspec' : 'none'
 
   if (getInput('add')) {
     core.info('> Adding files...')
-    await add(peh == 'ignore' ? 'pathspec' : 'none')
+    await add(ignoreErrors)
   } else core.info('> No files to add.')
 
   if (getInput('remove')) {
     core.info('> Removing files...')
-    await remove(peh == 'ignore' ? 'pathspec' : 'none')
+    await remove(ignoreErrors)
   } else core.info('> No files to remove.')
 
   core.info('> Checking for uncommitted changes in the git working tree...')
@@ -76,23 +77,36 @@ core.info(`Running in ${baseDir}`)
       await git
         .fetch(undefined, log)
         .pull(undefined, undefined, matchGitArgs(pullOption), log)
+
+      core.info('> Checking for conflicts...')
+      const status = await git.status(undefined, log)
+
+      if (!status.conflicted.length) {
+        core.info('> No conflicts found.')
+        core.info('> Re-staging files...')
+        if (getInput('add')) await add(ignoreErrors)
+        if (getInput('remove')) await remove(ignoreErrors)
+      } else
+        throw new Error(
+          `There are ${
+            status.conflicted.length
+          } conflicting files: ${status.conflicted.join(', ')}`
+        )
     } else core.info('> Not pulling from repo.')
 
     core.info('> Creating commit...')
-    const commitData = await git
+    await git
       .commit(getInput('message'), matchGitArgs(getInput('commit') || ''))
-      .catch((err) => {
-        log(err)
+      .then(async (data) => {
+        log(undefined, data)
+        setOutput('committed', 'true')
+        setOutput('commit_sha', data.commit)
+        await git
+          .revparse(data.commit)
+          .then((long_sha) => setOutput('commit_long_sha', long_sha))
+          .catch((err) => core.warning(`Couldn't parse long SHA:\n${err}`))
       })
-    if (commitData) {
-      log(undefined, commitData)
-      setOutput('committed', 'true')
-      setOutput('commit_sha', commitData.commit)
-      await git
-        .revparse(commitData.commit)
-        .then((long_sha) => setOutput('commit_long_sha', long_sha))
-        .catch((err) => core.warning(`Couldn't parse long SHA:\n${err}`))
-    }
+      .catch((err) => core.setFailed(err))
 
     if (getInput('tag')) {
       core.info('> Tagging commit...')
@@ -149,26 +163,12 @@ core.info(`Running in ${baseDir}`)
       if (getInput('tag')) {
         core.info('> Pushing tags to repo...')
         await git
-          .pushTags('origin', undefined, (e, d?) => log(undefined, e || d))
-          .catch(() => {
-            core.info(
-              '> Tag push failed: deleting remote tag and re-pushing...'
-            )
-            return git
-              .push(
-                undefined,
-                undefined,
-                {
-                  '--delete': null,
-                  origin: null,
-                  [matchGitArgs(getInput('tag') || '').filter(
-                    (w) => !w.startsWith('-')
-                  )[0]]: null
-                },
-                log
-              )
-              .pushTags('origin', undefined, log)
+          .pushTags('origin', matchGitArgs(getInput('tag_push') || ''))
+          .then((data) => {
+            setOutput('tag_pushed', 'true')
+            return log(null, data)
           })
+          .catch((err) => core.setFailed(err))
       } else core.info('> No tags to push.')
     } else core.info('> Not pushing anything.')
 
@@ -194,14 +194,12 @@ core.info(`Running in ${baseDir}`)
     core.setFailed(e)
   })
 
-async function add(
-  ignoreErrors: 'all' | 'pathspec' | 'none' = 'none'
-): Promise<(void | Response<void>)[]> {
+async function add(ignoreErrors: 'all' | 'pathspec' | 'none' = 'none') {
   const input = getInput('add')
   if (!input) return []
 
   const parsed = parseInputArray(input)
-  const res: (void | Response<void>)[] = []
+  const res: (string | void)[] = []
 
   for (const args of parsed) {
     res.push(