initial commit

Author: mgrybyk

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+
+# We recommend you to keep these unchanged.
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+indent_size = 4
+
+[*.md]
+trim_trailing_whitespace = false

.eslintrc.cjs

@@ -0,0 +1,23 @@
+module.exports = {
+    root: true,
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        project: './tsconfig.json',
+        ecmaVersion: 2021,
+    },
+    plugins: ['@typescript-eslint', 'prettier'],
+    extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/eslint-recommended',
+        'plugin:@typescript-eslint/recommended',
+        'prettier',
+        'plugin:prettier/recommended',
+    ],
+    env: {
+        node: true,
+    },
+    rules: {
+        '@typescript-eslint/no-floating-promises': 'error',
+        '@typescript-eslint/no-unused-vars': ['error'],
+    },
+}

.github/workflows/report_test.yml

@@ -0,0 +1,54 @@
+name: Test Action
+
+on:
+  pull_request:
+  push:
+    branches: ['main']
+  workflow_dispatch:
+
+permissions:
+  # Give the default GITHUB_TOKEN write permission to commit and push the changed files back to the repository.
+  contents: write
+
+# Allow only one job per PR or branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true # cancel jobs in progress
+
+jobs:
+  test:
+    timeout-minutes: 180
+    runs-on: ubuntu-latest
+    name: Build, Test, Action
+
+    steps:
+      # To use this repository's private action,
+      # you must check out the repository
+      - uses: actions/checkout@v3
+
+      - run: npm ci --no-fund --no-audit --no-progress
+      - run: npm run checks
+      - run: npm run build
+      - name: Make sure dist was commited before push
+        run: |
+          git status -s -uno
+          [ $(git status -s -uno | wc -l | bc ) != "0" ] && exit 1 || echo OK
+
+      # - name: Checkout gh-pages
+      #   uses: actions/checkout@v3
+      #   if: always()
+      #   continue-on-error: true
+      #   with:
+      #     ref: gh-pages # branch name
+      #     path: gh-pages-dir # checkout path
+
+      # - name: Local Allure Report Action
+      #   uses: ./ # Uses an action in the root directory
+      #   if: always()
+      #   continue-on-error: true
+      #   id: self_test # used in comment to PR
+      #   with:
+      #     report_id: 'self-test'
+      #     gh_pages: 'gh-pages-dir'
+      #     report_dir: 'allure-results'
+      #     list_dirs: ${{ github.ref == 'refs/heads/main' }}

.gitignore

@@ -0,0 +1,3 @@
+node_modules
+.DS_Store
+src/report_*.ts

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+npm run checks

.prettierrc

@@ -0,0 +1,6 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "printWidth": 140
+}

README.md

@@ -0,0 +1,18 @@
+# git-commit-pull-push-action
+
+Runs git add, git commit, git pull and git push.
+
+The action flow:
+
+1. git add .
+2. check if there are any changed files
+3. git commit 
+4. git pull (with args)
+5. 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`.
+
+## Usage
+
+todo
+

action.yml

@@ -0,0 +1,25 @@
+name: 'Git commit, pull & push action'
+description: 'Runs git add, git commit, git pull and git push'
+author: 'mgrybyk'
+branding:
+  icon: 'git-commit'
+  color: 'gray-dark'
+inputs:
+  repository:
+    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.
+    required: true
+  commit_message:
+    description: Commit message
+    required: false
+    default: Apply automatic changes
+  pull_args:
+    description: git pull arguments
+    required: false
+    default: --rebase -X ours
+runs:
+  using: 'node16'
+  main: 'dist/index.js'

index.ts

@@ -0,0 +1,49 @@
+import * as core from '@actions/core'
+import { isFileExist } from './src/isFileExists.js'
+import { spawnProcess } from './src/spawnProcess.js'
+
+try {
+    // vars
+    const repository = core.getInput('repository')
+    const branch = core.getInput('branch')
+    const commitMessage = core.getInput('commit_message')
+    const pullArgs = core.getInput('pull_args')
+
+    // log
+    console.log({
+        repository,
+        branch,
+        commitMessage,
+        pullArgs,
+    })
+
+    if (!(await isFileExist(repository))) {
+        throw new Error("repository directory doesn't exist: " + repository)
+    }
+
+    await spawnProcess('git', ['add', '.'], 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',
+            [
+                '-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 spawnProcess('git', ['pull', ...pullArgs.split(' ')], repository)
+        await spawnProcess('git', ['push', '--no-verify', 'origin', branch], repository)
+    }
+} catch (error) {
+    core.setFailed(error.message)
+}