update pull command default args

Author: mgrybyk

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Mykola Grybyk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -4,23 +4,35 @@ Runs git add, git commit, git pull and git push.
 
 The action flow:
 
-1. `git add .`
+1. `git add` (with `add_args`, defaults to `.`)
 2. check if there are any changed files
-3. `git commit`
-4. `git pull` (with args)
-5. `git push`
+3. `git fetch`
+4. `git checkout branch` (to allow push in PRs)
+5. `git commit`
+6. `git pull` (with `pull_args`, defaults to `--rebase`)
+7. `git push`
 
-Originally designed to run `git pull --rebase -X ours` or `git pull --rebase -X theirs` after commit to help pushing changed to `gh-pages`.
+Originally designed to run `git pull --rebase -X ours` or `git pull --rebase -X theirs` after commit to help pushing changes to `gh-pages`.
 
 ## Usage
 
 ```yaml
 - name: Git Commit and Push Action
   uses: mgrybyk/git-commit-pull-push-action@v1
   with:
-    repository: test-action-dir
-    branch: test-action
+    repository: gh-pages
+    branch: gh-pages # ${{ github.head_ref }}
     commit_message: Apply automatic changes
-    pull_args: --rebase -X theirs
+    pull_args: --rebase -X ours
 ```
 
+### Merge strategy specific option
+
+`-X` (same as `--strategy-option`).
+
+- `ours`: option forces conflicting chunks to be auto-resolved cleanly by favoring **our** (current) version (instead of incoming). 
+- `theirs`:  is the opposite of **ours**. 
+
+## API
+
+Please see [action.yml](./action.yml)

action.yml

@@ -6,11 +6,11 @@ branding:
   color: 'gray-dark'
 inputs:
   repository:
-    description: Local file path to the git repository. Defaults to the current directory (`.`)
+    description: Local file path to the git repository. Defaults to the current directory '.'
     required: true
     default: '.'
   branch:
-    description: Git branch name, where changes should be pushed too.
+    description: Git branch name, where changes should be pushed to.
     required: true
   commit_message:
     description: Commit message
@@ -19,7 +19,11 @@ inputs:
   pull_args:
     description: git pull arguments
     required: false
-    default: --rebase -X ours
+    default: --rebase
+  add_args:
+    description: git add arguments (eg. -u) or 'src/*.js'
+    required: false
+    default: '.'
 runs:
   using: 'node16'
   main: 'dist/index.js'

dist/index.js

@@ -2713,38 +2713,40 @@ try {
     const branch = _actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput('branch');
     const commitMessage = _actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput('commit_message');
     const pullArgs = _actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput('pull_args');
+    const addArgs = _actions_core__WEBPACK_IMPORTED_MODULE_0__.getInput('add_args');
     // log
     console.log({
         repository,
         branch,
         commitMessage,
         pullArgs,
+        addArgs,
     });
     if (!(await (0,_src_isFileExists_js__WEBPACK_IMPORTED_MODULE_1__/* .isFileExist */ .e)(repository))) {
         throw new Error("repository directory doesn't exist: " + repository);
     }
     if (branch.trim() === '') {
         throw new Error('branch is a required field');
     }
-    await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['add', '.'], repository);
+    await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['config', '--global', 'user.name', '"github-actions[bot]"'], repository);
+    await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['config', '--global', 'user.email', '"41898282+github-actions[bot]@users.noreply.github.com"'], repository);
+    await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['add', ...addArgs.split(' ')], repository);
     const diff = await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['diff', '--staged', '--name-only'], repository);
     if (diff.trim() === '') {
         console.log('Working tree is empty. Nothing to commit.');
     }
     else {
+        await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['fetch', '--depth=1'], repository);
+        await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['checkout', branch], repository);
         await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', [
-            '-c',
-            'user.name="github-actions[bot]"',
-            '-c',
-            'user.email="41898282+github-actions[bot]@users.noreply.github.com"',
             'commit',
             '-m',
             commitMessage,
             '--author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"',
             '--no-verify',
         ], repository);
         await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['pull', ...pullArgs.split(' ')], repository);
-        await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['push', '--no-verify', 'origin', branch], repository);
+        console.log(await (0,_src_spawnProcess_js__WEBPACK_IMPORTED_MODULE_2__/* .spawnProcess */ .y)('git', ['push', '--no-verify'], repository));
     }
 }
 catch (error) {

index.ts

@@ -8,13 +8,15 @@ try {
     const branch = core.getInput('branch')
     const commitMessage = core.getInput('commit_message')
     const pullArgs = core.getInput('pull_args')
+    const addArgs = core.getInput('add_args')
 
     // log
     console.log({
         repository,
         branch,
         commitMessage,
         pullArgs,
+        addArgs,
     })
 
     if (!(await isFileExist(repository))) {
@@ -25,18 +27,19 @@ try {
         throw new Error('branch is a required field')
     }
 
-    await spawnProcess('git', ['add', '.'], repository)
+    await spawnProcess('git', ['config', '--global', 'user.name', '"github-actions[bot]"'], repository)
+    await spawnProcess('git', ['config', '--global', 'user.email', '"41898282+github-actions[bot]@users.noreply.github.com"'], repository)
+
+    await spawnProcess('git', ['add', ...addArgs.split(' ')], repository)
     const diff = await spawnProcess('git', ['diff', '--staged', '--name-only'], repository)
     if (diff.trim() === '') {
         console.log('Working tree is empty. Nothing to commit.')
     } else {
+        await spawnProcess('git', ['fetch', '--depth=1'], repository)
+        await spawnProcess('git', ['checkout', branch], repository)
         await spawnProcess(
             'git',
             [
-                '-c',
-                'user.name="github-actions[bot]"',
-                '-c',
-                'user.email="41898282+github-actions[bot]@users.noreply.github.com"',
                 'commit',
                 '-m',
                 commitMessage,
@@ -46,7 +49,7 @@ try {
             repository
         )
         await spawnProcess('git', ['pull', ...pullArgs.split(' ')], repository)
-        await spawnProcess('git', ['push', '--no-verify', 'origin', branch], repository)
+        console.log(await spawnProcess('git', ['push', '--no-verify'], repository))
     }
 } catch (error) {
     core.setFailed(error.message)

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "git-commit-pull-push-action",
-  "version": "1.0.0",
-  "description": "",
+  "version": "1.2.1",
+  "description": "Runs git add, git commit, git pull and git push",
   "main": "index.js",
   "type": "module",
   "scripts": {

package.json

@@ -1,4 +1,6 @@
 TAG_MAJOR=v1
+git fetch
+git rebase
 git tag --delete $TAG_MAJOR
 git push --delete origin $TAG_MAJOR
 git tag $TAG_MAJOR