Merge pull request #36 from michmich112/bf/#35

Bug Fix Pull Request trigger

Author: michmich112

.github/workflows/release.yml

@@ -0,0 +1,34 @@
+name: Release Action
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - dist/**
+      - src/**
+      - node_modules/**
+      - package-lock.json
+      - package.json
+  workflow_dispatch:
+
+jobs: 
+  bump_and_release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with: 
+          node-version: '12'
+      - name: Bump & Tag
+        uses: michmich112/version-bumper@master
+        with:
+          scheme: org_semantic
+          version-file: ./package.json
+          files: "[]"
+          rules: '[{"trigger": "commit", "bump": "build", "branch": "master", "tag": true},{"trigger": "manual", "bump": "minor", "reset": "build", "branch": "master", "tag": true} ]'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          
+

dist/index.js

@@ -44,7 +44,6 @@ const gh_action_stats_1 = __importDefault(require("gh-action-stats"));
 const options_1 = require("./utils/options");
 const readline = __importStar(require("readline"));
 const gitUtils_1 = require("./utils/gitUtils");
-const Git_1 = __importDefault(require("./lib/Git"));
 const SUCCESS = 0, FAILURE = 1;
 function main() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -59,8 +58,6 @@ function main() {
                 core.info('No bump rules applicable');
                 return SUCCESS;
             }
-            yield new Git_1.default().checkoutBranch(state.branch);
-            yield bump(state);
             const GIT_OPTIONS = {
                 userName: 'version-bumper',
                 userEmail: '[email protected]',
@@ -69,12 +66,16 @@ function main() {
                 token: core.getInput('github-token'),
                 branch: state.branch
             };
+            const git = yield (0, gitUtils_1.configureGit)(GIT_OPTIONS);
+            yield (yield git.fetchRemoteBranch(state.branch)).checkoutBranch(state.branch);
+            yield bump(state);
             yield (0, gitUtils_1.commitAndPush)(GIT_OPTIONS);
             return SUCCESS;
         }
         catch (e) {
             core.error(e.message);
-            return FAILURE;
+            core.setFailed(`Error: ${e.message}, Validate options file or create an issue if this persists`);
+            throw e;
         }
     });
 }

dist/lib/Git.js

@@ -60,6 +60,17 @@ class Git {
             return this;
         });
     }
+    /**
+     * Fetch branch from remote
+     * @param {string} branch: Branch name to fetch
+     * @returns {Promise<Git>}
+     */
+    fetchRemoteBranch(branch) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, exec_1.exec)('git', ['fetch', this.remoteName, branch], this.execOptions);
+            return this;
+        });
+    }
     /**
      * Stage all new modifications
      * @returns {Promise<Git>}

dist/utils/gitUtils.js

@@ -50,7 +50,7 @@ function configureGit(gitOptions, remoteName = 'github', gitInterface) {
             listeners: {
                 stdline: core.debug,
                 stderr: (data) => {
-                    core.warning(data.toString());
+                    core.debug(data.toString());
                 },
                 debug: core.debug,
             },
@@ -78,7 +78,7 @@ function commit(commitOptions, gitInterface) {
             listeners: {
                 stdline: core.debug,
                 stderr: (data) => {
-                    core.error(data.toString());
+                    core.debug(data.toString());
                 },
                 debug: core.debug,
             },
@@ -102,8 +102,7 @@ exports.commit = commit;
  */
 function commitAndPush(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        let git = yield configureGit(options);
-        yield commit(options, git);
+        const git = yield commit(options);
         yield git.pushBranch(options.branch);
     });
 }

src/index.ts

@@ -6,7 +6,7 @@ import { getBumperOptions, getBumperState } from "./utils/options";
 import BumperOptionsFile, { VersionFile } from "./lib/types/OptionsFile.types";
 import BumperState from "./lib/types/BumperState.type";
 import * as readline from "readline";
-import { commitAndPush } from "./utils/gitUtils";
+import { commitAndPush, configureGit } from "./utils/gitUtils";
 import { CommitOptions } from "./lib/types/Git.types";
 import Git from './lib/Git';
 
@@ -30,8 +30,6 @@ async function main() {
       core.info('No bump rules applicable');
       return SUCCESS;
     }
-    await new Git().checkoutBranch(state.branch);
-    await bump(state);
 
     const GIT_OPTIONS: CommitOptions = {
       userName: 'version-bumper',
@@ -42,12 +40,18 @@ async function main() {
       branch: state.branch
     };
 
+    const git = await configureGit(GIT_OPTIONS);
+    await (await git.fetchRemoteBranch(state.branch)).checkoutBranch(state.branch);
+    await bump(state);
+
+
     await commitAndPush(GIT_OPTIONS);
 
     return SUCCESS;
   } catch (e: any) {
     core.error(e.message);
-    return FAILURE;
+    core.setFailed(`Error: ${e.message}, Validate options file or create an issue if this persists`);
+    throw e;
   }
 }
 

src/lib/Git.ts

@@ -50,6 +50,17 @@ export default class Git {
     return this;
   }
 
+
+  /**
+   * Fetch branch from remote
+   * @param {string} branch: Branch name to fetch
+   * @returns {Promise<Git>}
+   */
+  async fetchRemoteBranch(branch: string): Promise<Git> {
+    await exec('git', ['fetch', this.remoteName, branch], this.execOptions);
+    return this;
+  }
+
   /**
    * Stage all new modifications
    * @returns {Promise<Git>}

src/utils/gitUtils.ts

@@ -10,16 +10,16 @@ import Git from '../lib/Git';
  * @returns {Promise<Git>}
  */
 export async function configureGit(gitOptions: CommitOptions,
-                                   remoteName: string = 'github',
-                                   gitInterface?: Git): Promise<Git> {
+  remoteName: string = 'github',
+  gitInterface?: Git): Promise<Git> {
   const { GITHUB_ACTOR, GITHUB_REPOSITORY } = process.env;
   const ORIGIN = `https://${GITHUB_ACTOR}:${gitOptions.token}@github.com/${GITHUB_REPOSITORY}.git`;
   const EXEC_OPTIONS = {
     cwd: process.env.GITHUB_WORKSPACE,
     listeners: {
       stdline: core.debug,
       stderr: (data: Buffer) => {
-        core.warning(data.toString());
+        core.debug(data.toString());
       },
       debug: core.debug,
     },
@@ -48,7 +48,7 @@ export async function commit(commitOptions: CommitOptions, gitInterface?: Git):
     listeners: {
       stdline: core.debug,
       stderr: (data: Buffer) => {
-        core.error(data.toString());
+        core.debug(data.toString());
       },
       debug: core.debug,
     },
@@ -74,7 +74,6 @@ export async function commit(commitOptions: CommitOptions, gitInterface?: Git):
  * @returns {Promise<void>}
  */
 export async function commitAndPush(options: CommitOptions): Promise<void> {
-  let git = await configureGit(options);
-  await commit(options, git);
+  const git = await commit(options);
   await git.pushBranch(options.branch);
 }